summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2015-10-20 12:09:12 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-11-09 12:50:26 -0800
commitc58aebcd8c3240a5f7913f82f6131ff4b564d94b (patch)
tree0840364cc6a64532abfebb3fe2a03bc0afdb94ae
parent36ce9978ddfb0db0adf9e4bddcceca19be430801 (diff)
downloadlinux-c58aebcd8c3240a5f7913f82f6131ff4b564d94b.tar.gz
linux-c58aebcd8c3240a5f7913f82f6131ff4b564d94b.tar.bz2
linux-c58aebcd8c3240a5f7913f82f6131ff4b564d94b.zip
md/raid1: submit_bio_wait() returns 0 on success
commit 203d27b0226a05202438ddb39ef0ef1acb14a759 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>
-rw-r--r--drivers/md/raid1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 47b7c3136807..0d91644e80eb 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2251,7 +2251,7 @@ static int narrow_write_error(struct r1bio *r1_bio, int i)
bio_trim(wbio, sector - r1_bio->sector, sectors);
wbio->bi_iter.bi_sector += rdev->data_offset;
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)