2016-04-25 23:50:19

by Shaohua Li

Subject: [PATCH] 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 <[email protected]>
---
include/linux/blk_types.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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)
--
2.8.0.rc2

2016-04-26 01:16:49

by Jens Axboe

Subject: Re: [PATCH] block: copy NOMERGE flag from bio to request

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.


--
Jens Axboe