diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-11-11 15:05:31 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-11-11 15:05:31 -0800 |
commit | 83ec293e0817e2536097dd86f7aba9c1c39ef1d2 (patch) | |
tree | 63a5107d55cd7521b07473af5d138145254997b7 /drivers/md/raid1.c | |
parent | 42ed9e9dbae89671344a227469c9ee7f367c1ff9 (diff) | |
parent | 1ea3a378f2cc7c3b3b4f3285921445506d92c429 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/md/raid1.c')
-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 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) |