summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Derrick2016-12-20 22:38:14 +0100
committerJens Axboe2016-12-22 19:48:20 +0100
commit72c5296f9d64d8f5f27c2133e5f108a45a353d71 (patch)
tree3a65604359836aebcdd2b1ee855f6a34ab74bef0
parentblock: add back plugging in __blkdev_direct_IO (diff)
downloadkernel-qcow2-linux-72c5296f9d64d8f5f27c2133e5f108a45a353d71.tar.gz
kernel-qcow2-linux-72c5296f9d64d8f5f27c2133e5f108a45a353d71.tar.xz
kernel-qcow2-linux-72c5296f9d64d8f5f27c2133e5f108a45a353d71.zip
genhd: remove dead and duplicated scsi code
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> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--include/linux/genhd.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index e0341af6950e..76f39754e7b0 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;