From: Ming Lei <ming.lei@redhat.com>
Date: Mon, 18 Dec 2017 20:22:16 +0800
Subject: [PATCH] block: blk-merge: remove unnecessary check
Git-commit: cf8c0c6a3830583bd0e7c94933e155bf97cd162b
Patch-mainline: v4.16-rc1
References: bsc#1104967,FATE#325924
In this case, 'sectors' can't be zero at all, so remove the check
and let the bio be split.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Hannes Reinecke <hare@suse.com>
---
block/blk-merge.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/block/blk-merge.c b/block/blk-merge.c
index ca2e7aec8e77..446f63e076aa 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -129,9 +129,7 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
nsegs++;
sectors = max_sectors;
}
- if (sectors)
- goto split;
- /* Make this single bvec as the 1st segment */
+ goto split;
}
if (bvprvp && blk_queue_cluster(q)) {
--
2.16.4