Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: declare free_ipath() via DEFINE_FREE() 

The free_ipath() function was being used as a cleanup function
everywhere. Declare it via DEFINE_FREE() so we can use this function
with the __free() helper.

The name has also been adjusted so it's closer to the type's name.

Signed-off-by: Miquel Sabaté Solà <mssola@mssola.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Miquel Sabaté Solà 2025-10-24 12:21:40 +02:00 committed by David Sterba
parent 937f99c736
commit 285c3ab28e
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/btrfs/backref.c
View File

@ -2785,7 +2785,7 @@ struct btrfs_data_container *init_data_container(u32 total_bytes)
* allocates space to return multiple file system paths for an inode. * allocates space to return multiple file system paths for an inode.
* total_bytes to allocate are passed, note that space usable for actual path * total_bytes to allocate are passed, note that space usable for actual path
* information will be total_bytes - sizeof(struct inode_fs_paths). * information will be total_bytes - sizeof(struct inode_fs_paths).
* the returned pointer must be freed with free_ipath() in the end. * the returned pointer must be freed with __free_inode_fs_paths() in the end.
*/ */
struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root, struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,
struct btrfs_path *path) struct btrfs_path *path)
@ -2810,14 +2810,6 @@ struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,
return ifp; return ifp;
} }
void free_ipath(struct inode_fs_paths *ipath)
{
if (!ipath)
return;
kvfree(ipath->fspath);
kfree(ipath);
}
struct btrfs_backref_iter *btrfs_backref_iter_alloc(struct btrfs_fs_info *fs_info) struct btrfs_backref_iter *btrfs_backref_iter_alloc(struct btrfs_fs_info *fs_info)
{ {
struct btrfs_backref_iter *ret; struct btrfs_backref_iter *ret;

7
fs/btrfs/backref.h
View File

@ -241,7 +241,12 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,
struct btrfs_data_container *init_data_container(u32 total_bytes); struct btrfs_data_container *init_data_container(u32 total_bytes);
struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root, struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,
struct btrfs_path *path); struct btrfs_path *path);
void free_ipath(struct inode_fs_paths *ipath);
DEFINE_FREE(inode_fs_paths, struct inode_fs_paths *,
if (_T) {
kvfree(_T->fspath);
kfree(_T);
})
int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid, int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid,
u64 start_off, struct btrfs_path *path, u64 start_off, struct btrfs_path *path,

4
fs/btrfs/inode.c
View File

@ -130,7 +130,7 @@ static int data_reloc_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,
struct btrfs_fs_info *fs_info = warn->fs_info; struct btrfs_fs_info *fs_info = warn->fs_info;
struct extent_buffer *eb; struct extent_buffer *eb;
struct btrfs_inode_item *inode_item; struct btrfs_inode_item *inode_item;
struct inode_fs_paths *ipath = NULL; struct inode_fs_paths *ipath __free(inode_fs_paths) = NULL;
struct btrfs_root *local_root; struct btrfs_root *local_root;
struct btrfs_key key; struct btrfs_key key;
unsigned int nofs_flag; unsigned int nofs_flag;
@ -195,7 +195,6 @@ static int data_reloc_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,
} }
btrfs_put_root(local_root); btrfs_put_root(local_root);
free_ipath(ipath);
return 0; return 0;
err: err:
@ -203,7 +202,6 @@ static int data_reloc_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,
"checksum error at logical %llu mirror %u root %llu inode %llu offset %llu, path resolving failed with ret=%d", "checksum error at logical %llu mirror %u root %llu inode %llu offset %llu, path resolving failed with ret=%d",
warn->logical, warn->mirror_num, root, inum, offset, ret); warn->logical, warn->mirror_num, root, inum, offset, ret);
free_ipath(ipath);
return ret; return ret;
} }

3
fs/btrfs/ioctl.c
View File

@ -3298,7 +3298,7 @@ static long btrfs_ioctl_ino_to_path(struct btrfs_root *root, void __user *arg)
u64 rel_ptr; u64 rel_ptr;
int size; int size;
struct btrfs_ioctl_ino_path_args *ipa = NULL; struct btrfs_ioctl_ino_path_args *ipa = NULL;
struct inode_fs_paths *ipath = NULL; struct inode_fs_paths *ipath __free(inode_fs_paths) = NULL;
struct btrfs_path *path; struct btrfs_path *path;
if (!capable(CAP_DAC_READ_SEARCH)) if (!capable(CAP_DAC_READ_SEARCH))
@ -3346,7 +3346,6 @@ static long btrfs_ioctl_ino_to_path(struct btrfs_root *root, void __user *arg)
out: out:
btrfs_free_path(path); btrfs_free_path(path);
free_ipath(ipath);
kfree(ipa); kfree(ipa);
return ret; return ret;

4
fs/btrfs/scrub.c
View File

@ -505,7 +505,7 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,
struct btrfs_inode_item *inode_item; struct btrfs_inode_item *inode_item;
struct scrub_warning *swarn = warn_ctx; struct scrub_warning *swarn = warn_ctx;
struct btrfs_fs_info *fs_info = swarn->dev->fs_info; struct btrfs_fs_info *fs_info = swarn->dev->fs_info;
struct inode_fs_paths *ipath = NULL; struct inode_fs_paths *ipath __free(inode_fs_paths) = NULL;
struct btrfs_root *local_root; struct btrfs_root *local_root;
struct btrfs_key key; struct btrfs_key key;
@ -569,7 +569,6 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,
(char *)(unsigned long)ipath->fspath->val[i]); (char *)(unsigned long)ipath->fspath->val[i]);
btrfs_put_root(local_root); btrfs_put_root(local_root);
free_ipath(ipath);
return 0; return 0;
err: err:
@ -580,7 +579,6 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 num_bytes,
swarn->physical, swarn->physical,
root, inum, offset, ret); root, inum, offset, ret);
free_ipath(ipath);
return 0; return 0;
} }