aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2023-11-20 09:45:31 -0700
committerJens Axboe <axboe@kernel.dk>2023-11-20 09:45:31 -0700
commit8a554c6234731d63014391331127480755d6cac4 (patch)
tree01e771f4499b3d989680af6f5631cecb52ff21d6
parent3eba5e0b2422aec3c9e79822029599961fdcab97 (diff)
parent45b478951b2ba5aea70b2850c49c1aa83aedd0d2 (diff)
downloadlibata-8a554c6234731d63014391331127480755d6cac4.tar.gz
Merge tag 'md-fixes-20231120' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-6.7
Pull MD fix from Song. * tag 'md-fixes-20231120' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md: md: fix bi_status reporting in md_end_clone_io
-rw-r--r--drivers/md/md.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 4ee4593c874a76..c94373d64f2cd4 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -8666,7 +8666,8 @@ static void md_end_clone_io(struct bio *bio)
struct bio *orig_bio = md_io_clone->orig_bio;
struct mddev *mddev = md_io_clone->mddev;
- orig_bio->bi_status = bio->bi_status;
+ if (bio->bi_status && !orig_bio->bi_status)
+ orig_bio->bi_status = bio->bi_status;
if (md_io_clone->start_time)
bio_end_io_acct(orig_bio, md_io_clone->start_time);