diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-07-26 05:03:25 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2008-08-27 03:50:19 -0400 |
commit | 4beab5c623fef4622f9a8593f85760ff10b5a3f7 (patch) | |
tree | 630ad8965703e3ea8296945f4db10c80a348d2b4 /include/linux/blkdev.h | |
parent | 14e507b852e7dcea142b98757181bfa785cb4c05 (diff) |
block: rename blk_scsi_cmd_filter to blk_cmd_filter
Technically, the cmd_filter would be applied to other protocols though
it's unlikely to happen. Putting SCSI stuff to request_queue is kinda
layer violation. So let's rename it.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r-- | include/linux/blkdev.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d2d34e2774b2..ab247d589ad6 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -283,7 +283,7 @@ struct blk_queue_tag { | |||
283 | #define BLK_SCSI_MAX_CMDS (256) | 283 | #define BLK_SCSI_MAX_CMDS (256) |
284 | #define BLK_SCSI_CMD_PER_LONG (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8)) | 284 | #define BLK_SCSI_CMD_PER_LONG (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8)) |
285 | 285 | ||
286 | struct blk_scsi_cmd_filter { | 286 | struct blk_cmd_filter { |
287 | unsigned long read_ok[BLK_SCSI_CMD_PER_LONG]; | 287 | unsigned long read_ok[BLK_SCSI_CMD_PER_LONG]; |
288 | unsigned long write_ok[BLK_SCSI_CMD_PER_LONG]; | 288 | unsigned long write_ok[BLK_SCSI_CMD_PER_LONG]; |
289 | struct kobject kobj; | 289 | struct kobject kobj; |
@@ -407,7 +407,7 @@ struct request_queue | |||
407 | #if defined(CONFIG_BLK_DEV_BSG) | 407 | #if defined(CONFIG_BLK_DEV_BSG) |
408 | struct bsg_class_device bsg_dev; | 408 | struct bsg_class_device bsg_dev; |
409 | #endif | 409 | #endif |
410 | struct blk_scsi_cmd_filter cmd_filter; | 410 | struct blk_cmd_filter cmd_filter; |
411 | }; | 411 | }; |
412 | 412 | ||
413 | #define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */ | 413 | #define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */ |
@@ -843,11 +843,11 @@ extern int blkdev_issue_flush(struct block_device *, sector_t *); | |||
843 | /* | 843 | /* |
844 | * command filter functions | 844 | * command filter functions |
845 | */ | 845 | */ |
846 | extern int blk_verify_command(struct blk_scsi_cmd_filter *filter, | 846 | extern int blk_verify_command(struct blk_cmd_filter *filter, |
847 | unsigned char *cmd, int has_write_perm); | 847 | unsigned char *cmd, int has_write_perm); |
848 | extern int blk_register_filter(struct gendisk *disk); | 848 | extern int blk_register_filter(struct gendisk *disk); |
849 | extern void blk_unregister_filter(struct gendisk *disk); | 849 | extern void blk_unregister_filter(struct gendisk *disk); |
850 | extern void blk_set_cmd_filter_defaults(struct blk_scsi_cmd_filter *filter); | 850 | extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter); |
851 | 851 | ||
852 | #define MAX_PHYS_SEGMENTS 128 | 852 | #define MAX_PHYS_SEGMENTS 128 |
853 | #define MAX_HW_SEGMENTS 128 | 853 | #define MAX_HW_SEGMENTS 128 |