From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Tue, 20 Oct 2015 16:09:13 +0000 (-0400)
Subject: md/raid10: submit_bio_wait() returns 0 on success
X-Git-Tag: v4.1.12-92~201^2~73
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3f2189fc2be65e8f3fc032d039cd8d7b5e9a7631;p=users%2Fjedix%2Flinux-maple.git

md/raid10: submit_bio_wait() returns 0 on success

Orabug: 22623822

commit 681ab4696062f5aa939c9e04d058732306a97176 upstream.

This was introduced with 9e882242c6193ae6f416f2d8d8db0d9126bd996b
which changed the return value of submit_bio_wait() to return != 0 on
error, but didn't update the caller accordingly.

Fixes: 9e882242c6 ("block: Add submit_bio_wait(), remove from md")
Reported-by: Bill Kuzeja <William.Kuzeja@stratus.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry picked from commit e73ccce0672d430409dd021735d658bdcd78656e)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index fe0122771642b..adfc83a0f023c 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -2590,7 +2590,7 @@ static int narrow_write_error(struct r10bio *r10_bio, int i)
 				   choose_data_offset(r10_bio, rdev) +
 				   (sector - r10_bio->sector));
 		wbio->bi_bdev = rdev->bdev;
-		if (submit_bio_wait(WRITE, wbio) == 0)
+		if (submit_bio_wait(WRITE, wbio) < 0)
 			/* Failure! */
 			ok = rdev_set_badblocks(rdev, sector,
 						sectors, 0)