diff options
-rw-r--r-- | block/blk-core.c | 3 | ||||
-rw-r--r-- | include/linux/blkdev.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index b8ffbfe85ca4..fa212348c4c9 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -574,7 +574,8 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) | |||
574 | q->request_fn = rfn; | 574 | q->request_fn = rfn; |
575 | q->prep_rq_fn = NULL; | 575 | q->prep_rq_fn = NULL; |
576 | q->unplug_fn = generic_unplug_device; | 576 | q->unplug_fn = generic_unplug_device; |
577 | q->queue_flags = (1 << QUEUE_FLAG_CLUSTER); | 577 | q->queue_flags = (1 << QUEUE_FLAG_CLUSTER | |
578 | 1 << QUEUE_FLAG_STACKABLE); | ||
578 | q->queue_lock = lock; | 579 | q->queue_lock = lock; |
579 | 580 | ||
580 | blk_queue_segment_boundary(q, 0xffffffff); | 581 | blk_queue_segment_boundary(q, 0xffffffff); |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 964c246bc271..86f77ef127f4 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -441,6 +441,7 @@ struct request_queue | |||
441 | #define QUEUE_FLAG_NOMERGES 10 /* disable merge attempts */ | 441 | #define QUEUE_FLAG_NOMERGES 10 /* disable merge attempts */ |
442 | #define QUEUE_FLAG_SAME_COMP 11 /* force complete on same CPU */ | 442 | #define QUEUE_FLAG_SAME_COMP 11 /* force complete on same CPU */ |
443 | #define QUEUE_FLAG_FAIL_IO 12 /* fake timeout */ | 443 | #define QUEUE_FLAG_FAIL_IO 12 /* fake timeout */ |
444 | #define QUEUE_FLAG_STACKABLE 13 /* supports request stacking */ | ||
444 | 445 | ||
445 | static inline int queue_is_locked(struct request_queue *q) | 446 | static inline int queue_is_locked(struct request_queue *q) |
446 | { | 447 | { |
@@ -547,6 +548,8 @@ enum { | |||
547 | #define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags) | 548 | #define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags) |
548 | #define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags) | 549 | #define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags) |
549 | #define blk_queue_flushing(q) ((q)->ordseq) | 550 | #define blk_queue_flushing(q) ((q)->ordseq) |
551 | #define blk_queue_stackable(q) \ | ||
552 | test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags) | ||
550 | 553 | ||
551 | #define blk_fs_request(rq) ((rq)->cmd_type == REQ_TYPE_FS) | 554 | #define blk_fs_request(rq) ((rq)->cmd_type == REQ_TYPE_FS) |
552 | #define blk_pc_request(rq) ((rq)->cmd_type == REQ_TYPE_BLOCK_PC) | 555 | #define blk_pc_request(rq) ((rq)->cmd_type == REQ_TYPE_BLOCK_PC) |