| From | Kamal Mostafa <> | Subject | [PATCH 3.13.y-ckt 85/96] md/raid1: submit_bio_wait() returns 0 on success | Date | Fri, 13 Nov 2015 13:49:39 -0800 |
| |
3.13.11-ckt30 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Jes Sorensen <Jes.Sorensen@redhat.com>
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: Kamal Mostafa <kamal@canonical.com> --- drivers/md/raid1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 1bcdcf1..8646f04 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2250,7 +2250,7 @@ static int narrow_write_error(struct r1bio *r1_bio, int i) bio_trim(wbio, sector - r1_bio->sector, sectors); wbio->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) -- 1.9.1
|