From: Ming Lei <ming.lei@redhat.com>
Date: Mon, 18 Dec 2017 12:22:16 +0000 (+0800)
Subject: block: blk-merge: remove unnecessary check
X-Git-Tag: v4.16-rc1~86^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf8c0c6a3830583bd0e7c94933e155bf97cd162b;p=thirdparty%2Fkernel%2Flinux.git

block: blk-merge: remove unnecessary check

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>
---

diff --git a/block/blk-merge.c b/block/blk-merge.c
index ca2e7aec8e777..446f63e076aa9 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)) {