qiurui
/
linux-kernelorg-stable
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: make btrfs_iget_path() return a btrfs inode instead 

It's an internal function and btrfs_iget() is now returning a btrfs inode,
so change btrfs_iget_path() to also return a btrfs inode instead of a VFS
inode.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Filipe Manana 2025-03-07 12:27:15 +00:00 committed by David Sterba
parent b204e5c7d4
commit 92be661a57
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/btrfs_inode.h
View File

@ -593,8 +593,8 @@ void btrfs_free_inode(struct inode *inode);
int btrfs_drop_inode(struct inode *inode); int btrfs_drop_inode(struct inode *inode);
int __init btrfs_init_cachep(void); int __init btrfs_init_cachep(void);
void __cold btrfs_destroy_cachep(void); void __cold btrfs_destroy_cachep(void);
struct inode *btrfs_iget_path(u64 ino, struct btrfs_root *root, struct btrfs_inode *btrfs_iget_path(u64 ino, struct btrfs_root *root,
struct btrfs_path *path); struct btrfs_path *path);
struct btrfs_inode *btrfs_iget(u64 ino, struct btrfs_root *root); struct btrfs_inode *btrfs_iget(u64 ino, struct btrfs_root *root);
struct extent_map *btrfs_get_extent(struct btrfs_inode *inode, struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,
struct folio *folio, u64 start, u64 len); struct folio *folio, u64 start, u64 len);

10
fs/btrfs/free-space-cache.c
View File

@ -88,7 +88,7 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,
struct btrfs_disk_key disk_key; struct btrfs_disk_key disk_key;
struct btrfs_free_space_header *header; struct btrfs_free_space_header *header;
struct extent_buffer *leaf; struct extent_buffer *leaf;
struct inode *inode = NULL; struct btrfs_inode *inode;
unsigned nofs_flag; unsigned nofs_flag;
int ret; int ret;
@ -120,13 +120,13 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,
btrfs_release_path(path); btrfs_release_path(path);
memalloc_nofs_restore(nofs_flag); memalloc_nofs_restore(nofs_flag);
if (IS_ERR(inode)) if (IS_ERR(inode))
return inode; return ERR_CAST(inode);
mapping_set_gfp_mask(inode->i_mapping, mapping_set_gfp_mask(inode->vfs_inode.i_mapping,
mapping_gfp_constraint(inode->i_mapping, mapping_gfp_constraint(inode->vfs_inode.i_mapping,
~(__GFP_FS | __GFP_HIGHMEM))); ~(__GFP_FS | __GFP_HIGHMEM)));
return inode; return &inode->vfs_inode;
} }
struct inode *lookup_free_space_inode(struct btrfs_block_group *block_group, struct inode *lookup_free_space_inode(struct btrfs_block_group *block_group,

8
fs/btrfs/inode.c
View File

@ -5642,8 +5642,8 @@ static struct btrfs_inode *btrfs_iget_locked(u64 ino, struct btrfs_root *root)
* Get an inode object given its inode number and corresponding root. Path is * Get an inode object given its inode number and corresponding root. Path is
* preallocated to prevent recursing back to iget through allocator. * preallocated to prevent recursing back to iget through allocator.
*/ */
struct inode *btrfs_iget_path(u64 ino, struct btrfs_root *root, struct btrfs_inode *btrfs_iget_path(u64 ino, struct btrfs_root *root,
struct btrfs_path *path) struct btrfs_path *path)
{ {
struct btrfs_inode *inode; struct btrfs_inode *inode;
int ret; int ret;
@ -5653,14 +5653,14 @@ struct inode *btrfs_iget_path(u64 ino, struct btrfs_root *root,
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
if (!(inode->vfs_inode.i_state & I_NEW)) if (!(inode->vfs_inode.i_state & I_NEW))
return &inode->vfs_inode; return inode;
ret = btrfs_read_locked_inode(inode, path); ret = btrfs_read_locked_inode(inode, path);
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
unlock_new_inode(&inode->vfs_inode); unlock_new_inode(&inode->vfs_inode);
return &inode->vfs_inode; return inode;
} }
/* /*