diff options
author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2015-10-20 12:09:12 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.com> | 2015-10-20 16:20:15 -0400 |
commit | 203d27b0226a05202438ddb39ef0ef1acb14a759 (patch) | |
tree | 5b9b20e24daf4781602341f53d413ce1e1931ec9 | |
parent | 7379047d5585187d1288486d4627873170d0005a (diff) |
md/raid1: submit_bio_wait() returns 0 on success
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")
Cc: stable@vger.kernel.org (v3.10)
Reported-by: Bill Kuzeja <William.Kuzeja@stratus.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.com>
-rw-r--r-- | drivers/md/raid1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index ddd8a5f572aa..cfca6edf7813 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
@@ -2195,7 +2195,7 @@ static int narrow_write_error(struct r1bio *r1_bio, int i) | |||
2195 | bio_trim(wbio, sector - r1_bio->sector, sectors); | 2195 | bio_trim(wbio, sector - r1_bio->sector, sectors); |
2196 | wbio->bi_iter.bi_sector += rdev->data_offset; | 2196 | wbio->bi_iter.bi_sector += rdev->data_offset; |
2197 | wbio->bi_bdev = rdev->bdev; | 2197 | wbio->bi_bdev = rdev->bdev; |
2198 | if (submit_bio_wait(WRITE, wbio) == 0) | 2198 | if (submit_bio_wait(WRITE, wbio) < 0) |
2199 | /* failure! */ | 2199 | /* failure! */ |
2200 | ok = rdev_set_badblocks(rdev, sector, | 2200 | ok = rdev_set_badblocks(rdev, sector, |
2201 | sectors, 0) | 2201 | sectors, 0) |