diff options
author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2015-10-20 12:09:12 -0400 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-11-15 12:51:52 -0500 |
commit | e9206476ace2064ae76e4d3c5d5b7cb9d81be007 (patch) | |
tree | f0a45e4efa4f25b25a11d4023e7a0f38e738dd36 /drivers | |
parent | 90a7b3b32dcbe54a40eea29a8c1308475ac9d7ab (diff) |
md/raid1: submit_bio_wait() returns 0 on success
[ Upstream commit 203d27b0226a05202438ddb39ef0ef1acb14a759 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers')
-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 d24245c7b94a..3c8ada48ca76 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2245,7 +2245,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) |