diff options
| author | Shaohua Li <shli@fb.com> | 2016-04-25 16:50:14 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-04-25 19:13:44 -0600 |
| commit | 1fcbcc333f1fae6e11cc0839a6e72bc1a3e830bf (patch) | |
| tree | 030d2eb171727c7c89fb2e221ca4a1366576beaf | |
| parent | 93e9d8e836cb1a9a58b33eb6643bf061c6119ef2 (diff) | |
| download | linux-1fcbcc333f1fae6e11cc0839a6e72bc1a3e830bf.tar.bz2 | |
block: copy NOMERGE flag from bio to request
bio might have NOMERGE flag set, for example blk_queue_split sets it.
When we initiate request, copy this flag too.
Signed-off-by: Shaohua Li <shli@fb.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 86a38ea1823f..77e5d81f07aa 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -208,7 +208,7 @@ enum rq_flag_bits { #define REQ_COMMON_MASK \ (REQ_WRITE | REQ_FAILFAST_MASK | REQ_SYNC | REQ_META | REQ_PRIO | \ REQ_DISCARD | REQ_WRITE_SAME | REQ_NOIDLE | REQ_FLUSH | REQ_FUA | \ - REQ_SECURE | REQ_INTEGRITY) + REQ_SECURE | REQ_INTEGRITY | REQ_NOMERGE) #define REQ_CLONE_MASK REQ_COMMON_MASK #define BIO_NO_ADVANCE_ITER_MASK (REQ_DISCARD|REQ_WRITE_SAME) |