diff options
| author | Jens Axboe | 2014-05-30 16:11:50 +0200 |
|---|---|---|
| committer | Jens Axboe | 2014-05-30 16:11:50 +0200 |
| commit | f89ca166460e84620db73d4542f28d34c40a8917 (patch) | |
| tree | 6f7ef4b566879674d3dfc6e79b71561a49ac877e /include/linux/blkdev.h | |
| parent | Merge branch 'stable/for-jens-3.16' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | blk-mq: blk_mq_tag_to_rq should handle flush request (diff) | |
| download | kernel-qcow2-linux-f89ca166460e84620db73d4542f28d34c40a8917.tar.gz kernel-qcow2-linux-f89ca166460e84620db73d4542f28d34c40a8917.tar.xz kernel-qcow2-linux-f89ca166460e84620db73d4542f28d34c40a8917.zip | |
Merge branch 'for-3.16/core' into for-3.16/drivers
Pulled in for the blk_mq_tag_to_rq() change, which impacts
mtip32xx.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e90e1692e052..8aba35f46f87 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -510,6 +510,7 @@ struct request_queue { #define QUEUE_FLAG_SAME_FORCE 18 /* force complete on same CPU */ #define QUEUE_FLAG_DEAD 19 /* queue tear-down finished */ #define QUEUE_FLAG_INIT_DONE 20 /* queue is initialized */ +#define QUEUE_FLAG_NO_SG_MERGE 21 /* don't attempt to merge SG segments*/ #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_STACKABLE) | \ @@ -1069,7 +1070,6 @@ static inline void blk_post_runtime_resume(struct request_queue *q, int err) {} * schedule() where blk_schedule_flush_plug() is called. */ struct blk_plug { - unsigned long magic; /* detect uninitialized use-cases */ struct list_head list; /* requests */ struct list_head mq_list; /* blk-mq requests */ struct list_head cb_list; /* md requires an unplug callback */ |