diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-10-20 16:12:10 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-10-28 17:45:17 +0300 |
| commit | bd1c1c21741cbd6e894960bcbc8b36f719590064 (patch) | |
| tree | 01f8e2ee74252cd056fe311f0c27d4ac19e37662 | |
| parent | c4aebd0332da831a3403faf2035af45059ab6b7c (diff) | |
| download | linux-bd1c1c21741cbd6e894960bcbc8b36f719590064.tar.xz | |
block: REQ_NOMERGE is common to the bio and request
So move it into the common setion of the request flags.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Shaun Tancheff <shaun.tancheff@seagate.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | include/linux/blk_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index dd50dce89a80..b54142534793 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -158,6 +158,7 @@ enum rq_flag_bits { __REQ_META, /* metadata io request */ __REQ_PRIO, /* boost priority in cfq */ + __REQ_NOMERGE, /* don't touch this for merging */ __REQ_NOIDLE, /* don't anticipate more IO after this one */ __REQ_INTEGRITY, /* I/O includes block integrity payload */ __REQ_FUA, /* forced unit access */ @@ -171,7 +172,6 @@ enum rq_flag_bits { /* request only flags */ __REQ_SORTED, /* elevator knows about this request */ __REQ_SOFTBARRIER, /* may not be passed by ioscheduler */ - __REQ_NOMERGE, /* don't touch this for merging */ __REQ_STARTED, /* drive already may have started this one */ __REQ_DONTPREP, /* don't call prep for this one */ __REQ_QUEUED, /* uses queueing */ |