summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-01-23 14:31:09 +0100
committerJens Axboe <axboe@fb.com>2017-01-27 15:08:35 -0700
commitfb045ca25cc7b6d46368ab8221774489c2a81648 (patch)
tree242f882c5a3e0672d53bf1da349eb76e8141760c /block
parent82ed4db499b8598f16f8871261bff088d6b0597f (diff)
downloadlinux-0-day-fb045ca25cc7b6d46368ab8221774489c2a81648.tar.gz
linux-0-day-fb045ca25cc7b6d46368ab8221774489c2a81648.tar.xz
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>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index f3bc083d4c148..95829523cded0 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);