Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9206476 authored by Jes Sorensen's avatar Jes Sorensen Committed by Sasha Levin
Browse files

md/raid1: submit_bio_wait() returns 0 on success 



[ Upstream commit 203d27b0226a05202438ddb39ef0ef1acb14a759 ]

This was introduced with 9e882242
which changed the return value of submit_bio_wait() to return != 0 on
error, but didn't update the caller accordingly.

Fixes: 9e882242 ("block: Add submit_bio_wait(), remove from md")
Cc: stable@vger.kernel.org (v3.10)
Reported-by: default avatarBill Kuzeja <William.Kuzeja@stratus.com>
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 90a7b3b3

drivers/md/raid1.c

+1 −1
Original line number Diff line number Diff line
@@ -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)