summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2023-11-20 17:45:31 +0100
committerJens Axboe <axboe@kernel.dk>2023-11-20 17:45:31 +0100
commit8a554c6234731d63014391331127480755d6cac4 (patch)
tree01e771f4499b3d989680af6f5631cecb52ff21d6 /drivers/md
parentbcache: avoid NULL checking to c->root in run_cache_set() (diff)
parentmd: fix bi_status reporting in md_end_clone_io (diff)
downloadlinux-8a554c6234731d63014391331127480755d6cac4.tar.xz
linux-8a554c6234731d63014391331127480755d6cac4.zip
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
Diffstat (limited to 'drivers/md')
-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 4ee4593c874a..c94373d64f2c 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);