From: Mike Snitzer <snitzer@redhat.com>
Date: Fri, 22 Feb 2019 14:52:02 +0000 (-0500)
Subject: dm: always call blk_queue_split() in dm_process_bio()
X-Git-Tag: v5.1-rc1~84^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=effd58c95f277744f75d6e08819ac859dbcbd351;p=linux.git

dm: always call blk_queue_split() in dm_process_bio()

Do not just call blk_queue_split() if the bio is_abnormal_io().

Fixes: 568c73a355e ("dm: update dm_process_bio() to split bio if in ->make_request_fn()")
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index d8a844c522e6..68d24056d0b1 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1735,9 +1735,8 @@ static blk_qc_t dm_process_bio(struct mapped_device *md,
 	 * won't be imposed.
 	 */
 	if (current->bio_list) {
-		if (is_abnormal_io(bio))
-			blk_queue_split(md->queue, &bio);
-		else
+		blk_queue_split(md->queue, &bio);
+		if (!is_abnormal_io(bio))
 			dm_queue_split(md, ti, &bio);
 	}