From patchwork Fri Sep 25 09:27:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 7263171 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D03EE9FC62 for ; Fri, 25 Sep 2015 09:29:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA5CC20B2E for ; Fri, 25 Sep 2015 09:29:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E4C020B40 for ; Fri, 25 Sep 2015 09:29:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755903AbbIYJ23 (ORCPT ); Fri, 25 Sep 2015 05:28:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44778 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755815AbbIYJ15 (ORCPT ); Fri, 25 Sep 2015 05:27:57 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id EB294C0B2B7C; Fri, 25 Sep 2015 09:27:56 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8P9Rj6N028310; Fri, 25 Sep 2015 05:27:54 -0400 From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: bart.vanassche@sandisk.com, James Bottomley , Christoph Hellwig , linux-scsi@vger.kernel.org Subject: [PATCH v3 3/4] scsi: move all obsolete ioctls to scsi_ioctl.h Date: Fri, 25 Sep 2015 11:27:43 +0200 Message-Id: <1443173264-4105-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1443173264-4105-1-git-send-email-pbonzini@redhat.com> References: <1443173264-4105-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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.h. Keep them together in preparation for exposing them in UAPI headers. Cc: James Bottomley Cc: Christoph Hellwig Cc: linux-scsi@vger.kernel.org Reviewed-by: Bart Van Assche Signed-off-by: Paolo Bonzini Reviewed-by: Hannes Reinecke Acked-by: Douglas Gilbert --- 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;