genhd: remove dead and duplicated scsi code
diff mbox

Message ID 1482269894-14034-1-git-send-email-jonathan.derrick@intel.com
State New
Headers show

Commit Message

Derrick, Jonathan Dec. 20, 2016, 9:38 p.m. UTC
blk_scsi_cmd_filter use was deprecated by 4beab5c6 and the SCSI macros
are duplicated in blkdev.h, both likely reintroduced by a bad merge from
540eed56.

Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
---
 include/linux/genhd.h | 9 ---------
 1 file changed, 9 deletions(-)

Comments

Christoph Hellwig Dec. 21, 2016, 7:50 a.m. UTC | #1
On Tue, Dec 20, 2016 at 02:38:14PM -0700, Jon Derrick wrote:
> blk_scsi_cmd_filter use was deprecated by 4beab5c6 and the SCSI macros
> are duplicated in blkdev.h, both likely reintroduced by a bad merge from
> 540eed56.
> 
> Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>

Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-block" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jens Axboe Dec. 22, 2016, 6:24 p.m. UTC | #2
On 12/20/2016 02:38 PM, Jon Derrick wrote:
> blk_scsi_cmd_filter use was deprecated by 4beab5c6 and the SCSI macros
> are duplicated in blkdev.h, both likely reintroduced by a bad merge from
> 540eed56.

Wow, 2008! Applied, thanks.

Patch
diff mbox

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index e0341af..76f3975 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -146,15 +146,6 @@  enum {
 	DISK_EVENT_EJECT_REQUEST		= 1 << 1, /* eject requested */
 };
 
-#define BLK_SCSI_MAX_CMDS	(256)
-#define BLK_SCSI_CMD_PER_LONG	(BLK_SCSI_MAX_CMDS / (sizeof(long) * 8))
-
-struct blk_scsi_cmd_filter {
-	unsigned long read_ok[BLK_SCSI_CMD_PER_LONG];
-	unsigned long write_ok[BLK_SCSI_CMD_PER_LONG];
-	struct kobject kobj;
-};
-
 struct disk_part_tbl {
 	struct rcu_head rcu_head;
 	int len;