From patchwork Thu Sep 17 13:42:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 7207491 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B179EBEEC1 for ; Thu, 17 Sep 2015 13:42:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC16E20814 for ; Thu, 17 Sep 2015 13:42:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D23BE2084B for ; Thu, 17 Sep 2015 13:42:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751697AbbIQNme (ORCPT ); Thu, 17 Sep 2015 09:42:34 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:34159 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751614AbbIQNmc (ORCPT ); Thu, 17 Sep 2015 09:42:32 -0400 Received: by wicfx3 with SMTP id fx3so24469405wic.1; Thu, 17 Sep 2015 06:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=kwIX6awPoBY4zHHV4mQ6HfIEZF/4uHnnm371dBXHHd4=; b=s+fqZPrszjbyGnDdK7groozVDUK/JfBARg/TrrhiwUsJnIxaNDDBm9Y9I/5dRkYEz7 Wxago1KTvBVgsu/Ia1HLIZj+uAhhPo3d6PMGohKXvljJ6W3gUyGXumknpt4nJAX7DrHK HM3in+AvQeSno7HHo9xAlb3iS8NNkxgL97o88J7di+9y8/ZSKMVm+yF7Gv5o2CB5ywmP UO+rZCfv7oBSnzaTiYK5MTJHaxLa2SlSjxgaD8jdx6HwxGhvYK1UJ/IsCCVLBLltlE1j CKlqgLZ0p/G7vbYLL6gKw7aTk3WPHxE2TClRQVA+/YkxpHdMvw1IK54DK9NgUy0s/+Y9 Ynig== X-Received: by 10.180.73.229 with SMTP id o5mr28859409wiv.36.1442497351334; Thu, 17 Sep 2015 06:42:31 -0700 (PDT) Received: from donizetti.lan. ([94.39.147.195]) by smtp.gmail.com with ESMTPSA id x7sm10209138wia.10.2015.09.17.06.42.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Sep 2015 06:42:30 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org Cc: James Bottomley , Christoph Hellwig , linux-scsi@vger.kernel.org Subject: [PATCH v2 3/4] scsi: move all obsolete ioctls to scsi/scsi_ioctl.h Date: Thu, 17 Sep 2015 15:42:17 +0200 Message-Id: <1442497338-17019-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1442497338-17019-1-git-send-email-pbonzini@redhat.com> References: <1442497338-17019-1-git-send-email-pbonzini@redhat.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some are in scsi/scsi.h. Keep them together in preparation for exposing them in UAPI headers. Suggested-by: Christoph Hellwig Signed-off-by: Paolo Bonzini Reviewed-by: Bart Van Assche --- include/scsi/scsi.h | 20 -------------------- include/scsi/scsi_ioctl.h | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index 5e2bafdbd96f..a96df31af89e 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -286,26 +286,6 @@ static inline int scsi_is_wlun(u64 lun) #define SCSI_REMOVAL_ALLOW 0 -/* - * Here are some scsi specific ioctl commands which are sometimes useful. - * - * Note that include/linux/cdrom.h also defines IOCTL 0x5300 - 0x5395 - */ - -/* Used to obtain PUN and LUN info. Conflicts with CDROMAUDIOBUFSIZ */ -#define SCSI_IOCTL_GET_IDLUN 0x5382 - -/* 0x5383 and 0x5384 were used for SCSI_IOCTL_TAGGED_{ENABLE,DISABLE} */ - -/* Used to obtain the host number of a device. */ -#define SCSI_IOCTL_PROBE_HOST 0x5385 - -/* Used to obtain the bus number for a device */ -#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386 - -/* Used to obtain the PCI location of a device */ -#define SCSI_IOCTL_GET_PCI 0x5387 - /* Pull a u32 out of a SCSI message (using BE SCSI conventions) */ static inline __u32 scsi_to_u32(__u8 *ptr) { diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h index c81962bef7a0..2bd9d67c201a 100644 --- a/include/scsi/scsi_ioctl.h +++ b/include/scsi/scsi_ioctl.h @@ -12,6 +12,26 @@ #define SCSI_IOCTL_DOORLOCK 0x5380 /* lock the eject mechanism */ #define SCSI_IOCTL_DOORUNLOCK 0x5381 /* unlock the mechanism */ +/* + * Here are some obsolete SCSI-specific ioctl commands. + * + * Note that include/linux/cdrom.h also defines IOCTL 0x5300 - 0x5395 + */ + +/* Used to obtain PUN and LUN info. Conflicts with CDROMAUDIOBUFSIZ */ +#define SCSI_IOCTL_GET_IDLUN 0x5382 + +/* 0x5383 and 0x5384 were used for SCSI_IOCTL_TAGGED_{ENABLE,DISABLE} */ + +/* Used to obtain the host number of a device. */ +#define SCSI_IOCTL_PROBE_HOST 0x5385 + +/* Used to obtain the bus number for a device */ +#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386 + +/* Used to obtain the PCI location of a device */ +#define SCSI_IOCTL_GET_PCI 0x5387 + #ifdef __KERNEL__ struct scsi_device;