From patchwork Thu Sep 17 13:42:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 7207521 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 0DEDCBEEC1 for ; Thu, 17 Sep 2015 13:43:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F6142084B for ; Thu, 17 Sep 2015 13:43:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DCF420814 for ; Thu, 17 Sep 2015 13:43:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751921AbbIQNmy (ORCPT ); Thu, 17 Sep 2015 09:42:54 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:35638 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751477AbbIQNmb (ORCPT ); Thu, 17 Sep 2015 09:42:31 -0400 Received: by wicge5 with SMTP id ge5so119466007wic.0; Thu, 17 Sep 2015 06:42:30 -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=yLQNJEGXtiApL3uU9pqNrQhinHajahRKGS72Y0plTw8=; b=MhUEXI2cnMR+QEyg9cBqK0rOcpcpbSp5XEFiWYdo10zfrnjb8QC4YvNFCZBxnrEeOi qo2RNN+P2wxeRRNBUGJ+NP9QeqlQ9Nime57PmBZ/I8gCOY10cnVnaqukQ9tLaIQvzZjU dgzGVdXnKuY3WdCLJIX6JNKbR+oLrG/1afWGQAK9xZFlxLuKy4gJ6r0LAf3Lvi838uer Dyr/MjKKswJ8m695q4CCN4oi6bqhK3FCwa/dIVyT/f/UgvcbzHw01tZv9iZltOVzHZwh NGoXU27sj/uujz4Ly1MemPQ7ibIUKeIB0vxBB+NZEajvV/u2atb45zIDs2CQwA9ElF/u Huig== X-Received: by 10.194.234.40 with SMTP id ub8mr61921497wjc.95.1442497350362; Thu, 17 Sep 2015 06:42:30 -0700 (PDT) Received: from donizetti.lan. ([94.39.147.195]) by smtp.gmail.com with ESMTPSA id x7sm10209138wia.10.2015.09.17.06.42.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Sep 2015 06:42:29 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org Cc: James Bottomley , Christoph Hellwig , linux-scsi@vger.kernel.org Subject: [PATCH v2 2/4] scsi: cleanup scsi/scsi_ioctl.h Date: Thu, 17 Sep 2015 15:42:16 +0200 Message-Id: <1442497338-17019-3-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 SCSI_REMOVAL_* goes together with other SCSI command constants in include/scsi/scsi.h. It is also used outside the implementation of the ioctls (and it is not part of the user API). scsi_fctargaddress/Scsi_FCTargAddress has had no in-tree use since commit ca61f10ab2b8 ("[SCSI] remove broken driver cpqfc", 2005-10-29). Remove it, just in time for the the tenth anniversary of its demise. Signed-off-by: Paolo Bonzini Reviewed-by: Bart Van Assche --- include/scsi/scsi.h | 6 ++++++ include/scsi/scsi_ioctl.h | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index e0a3398b1547..5e2bafdbd96f 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -279,6 +279,12 @@ static inline int scsi_is_wlun(u64 lun) #define SCSI_INQ_PQ_NOT_CON 0x01 #define SCSI_INQ_PQ_NOT_CAP 0x03 +/* + * PREVENT/ALLOW MEDIUM REMOVAL + */ +#define SCSI_REMOVAL_PREVENT 1 +#define SCSI_REMOVAL_ALLOW 0 + /* * Here are some scsi specific ioctl commands which are sometimes useful. diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h index 8d19d1d233c3..c81962bef7a0 100644 --- a/include/scsi/scsi_ioctl.h +++ b/include/scsi/scsi_ioctl.h @@ -12,9 +12,6 @@ #define SCSI_IOCTL_DOORLOCK 0x5380 /* lock the eject mechanism */ #define SCSI_IOCTL_DOORUNLOCK 0x5381 /* unlock the mechanism */ -#define SCSI_REMOVAL_PREVENT 1 -#define SCSI_REMOVAL_ALLOW 0 - #ifdef __KERNEL__ struct scsi_device; @@ -34,11 +31,6 @@ typedef struct scsi_idlun { __u32 host_unique_id; } Scsi_Idlun; -/* Fibre Channel WWN, port_id struct */ -typedef struct scsi_fctargaddress { - __u32 host_port_id; - unsigned char host_wwn[8]; // include NULL term. -} Scsi_FCTargAddress; int scsi_ioctl_block_when_processing_errors(struct scsi_device *sdev, int cmd, bool ndelay);