diff mbox

block: copy NOMERGE flag from bio to request

Message ID a0145c1154f503d43b7258e8c4892d5da316dfd9.1461626525.git.shli@fb.com (mailing list archive)
State New, archived
Headers show

Commit Message

Shaohua Li April 25, 2016, 11:50 p.m. UTC 
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>
---
 include/linux/blk_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jens Axboe April 26, 2016, 1:16 a.m. UTC | #1 
On 04/25/2016 05:50 PM, Shaohua Li wrote:
> bio might have NOMERGE flag set, for example blk_queue_split sets it.
> When we initiate request, copy this flag too.

Applied, thanks.
diff mbox

Patch

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 86a38ea..77e5d81 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)