]> git.hungrycats.org Git - linux/commitdiff
md/raid1: submit_bio_wait() returns 0 on success
authorJes Sorensen <Jes.Sorensen@redhat.com>
Tue, 20 Oct 2015 16:09:12 +0000 (12:09 -0400)
committerJiri Slaby <jslaby@suse.cz>
Thu, 12 Nov 2015 13:09:03 +0000 (14:09 +0100)
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: Jiri Slaby <jslaby@suse.cz>
drivers/md/raid1.c

index 1cb7642c1ba98663678748c60ae798092c539185..479828ad2021367b0a6335a5a88e8f0a4721c5ce 100644 (file)
@@ -2148,7 +2148,7 @@ static int narrow_write_error(struct r1bio *r1_bio, int i)
                md_trim_bio(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)