aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/blkdev.h8
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
286struct blk_scsi_cmd_filter { 286struct 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*/
846extern int blk_verify_command(struct blk_scsi_cmd_filter *filter, 846extern 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);
848extern int blk_register_filter(struct gendisk *disk); 848extern int blk_register_filter(struct gendisk *disk);
849extern void blk_unregister_filter(struct gendisk *disk); 849extern void blk_unregister_filter(struct gendisk *disk);
850extern void blk_set_cmd_filter_defaults(struct blk_scsi_cmd_filter *filter); 850extern 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