From: Christoph Hellwig <hch@lst.de>
Date: Mon, 23 Jan 2017 13:31:09 +0000 (+0100)
Subject: block: don't assign cmd_flags in __blk_rq_prep_clone
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fb045ca25cc7b6d46368ab8221774489c2a81648;p=openwrt%2Fstaging%2Fblogic.git

block: don't assign cmd_flags in __blk_rq_prep_clone

These days we have the proper flags set since request allocation time.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/block/blk-core.c b/block/blk-core.c
index f3bc083d4c14..95829523cded 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2983,7 +2983,6 @@ EXPORT_SYMBOL_GPL(blk_rq_unprep_clone);
 static void __blk_rq_prep_clone(struct request *dst, struct request *src)
 {
 	dst->cpu = src->cpu;
-	dst->cmd_flags = src->cmd_flags | REQ_NOMERGE;
 	dst->cmd_type = src->cmd_type;
 	dst->__sector = blk_rq_pos(src);
 	dst->__data_len = blk_rq_bytes(src);