| Message ID | 20250415035340.851288-1-frank.li@vivo.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v3] btrfs: reuse exit helper in btrfs_bioset_init() | expand |
On Mon, Apr 14, 2025 at 09:53:40PM -0600, Yangtao Li wrote: > Use btrfs_bioset_exit() instead, which is the preferred patttern in btrfs. > > Suggested-by: David Sterba <dsterba@suse.com> > Signed-off-by: Yangtao Li <frank.li@vivo.com> > --- > v3: > -add Suggested-by Adding tags is not a reason for resend, you can reply to the patch if there's something trivial missing. If there are functional changes it makes sense to resend. Added to for-next, thanks.
diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c index 8c2eee1f1878..f602dda99af0 100644 --- a/fs/btrfs/bio.c +++ b/fs/btrfs/bio.c @@ -900,22 +900,18 @@ int __init btrfs_bioset_init(void) return -ENOMEM; if (bioset_init(&btrfs_clone_bioset, BIO_POOL_SIZE, offsetof(struct btrfs_bio, bio), 0)) - goto out_free_bioset; + goto out; if (bioset_init(&btrfs_repair_bioset, BIO_POOL_SIZE, offsetof(struct btrfs_bio, bio), BIOSET_NEED_BVECS)) - goto out_free_clone_bioset; + goto out; if (mempool_init_kmalloc_pool(&btrfs_failed_bio_pool, BIO_POOL_SIZE, sizeof(struct btrfs_failed_bio))) - goto out_free_repair_bioset; + goto out; return 0; -out_free_repair_bioset: - bioset_exit(&btrfs_repair_bioset); -out_free_clone_bioset: - bioset_exit(&btrfs_clone_bioset); -out_free_bioset: - bioset_exit(&btrfs_bioset); +out: + btrfs_bioset_exit(); return -ENOMEM; }
Use btrfs_bioset_exit() instead, which is the preferred patttern in btrfs. Suggested-by: David Sterba <dsterba@suse.com> Signed-off-by: Yangtao Li <frank.li@vivo.com> --- v3: -add Suggested-by v2: -update commit msg -cancel reorder btrfs_bioset_exit() fs/btrfs/bio.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)