[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241029091121.16281-1-jth@kernel.org>
Date: Tue, 29 Oct 2024 10:11:21 +0100
From: Johannes Thumshirn <jth@...nel.org>
To: John Garry <john.g.garry@...cle.com>
Cc: linux-block@...r.kernel.org,
linux-btrfs@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-raid@...r.kernel.org,
axboe@...nel.dk,
song@...nel.org,
yukuai3@...wei.com,
hch@....de,
martin.petersen@...cle.com,
hare@...e.de,
Johannes Thumshirn <johannes.thumshirn@....com>
Subject: [PATCH] btrfs: handle bio_split() error
From: Johannes Thumshirn <johannes.thumshirn@....com>
Now that bio_split() can return errors, add error handling for it in
btrfs_split_bio() and ultimately btrfs_submit_chunk().
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@....com>
---
John,
in case you have to send a v3, can you please include this one in your series?
fs/btrfs/bio.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c
index 1f216d07eff6..96cacd5c03a5 100644
--- a/fs/btrfs/bio.c
+++ b/fs/btrfs/bio.c
@@ -81,6 +81,9 @@ static struct btrfs_bio *btrfs_split_bio(struct btrfs_fs_info *fs_info,
bio = bio_split(&orig_bbio->bio, map_length >> SECTOR_SHIFT, GFP_NOFS,
&btrfs_clone_bioset);
+ if (IS_ERR(bio))
+ return ERR_CAST(bio);
+
bbio = btrfs_bio(bio);
btrfs_bio_init(bbio, fs_info, NULL, orig_bbio);
bbio->inode = orig_bbio->inode;
@@ -687,6 +690,10 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
if (map_length < length) {
bbio = btrfs_split_bio(fs_info, bbio, map_length);
+ if (IS_ERR(bbio)) {
+ ret = PTR_ERR(bbio);
+ goto fail;
+ }
bio = &bbio->bio;
}
--
2.43.0
Powered by blists - more mailing lists