mirror of
https://github.com/torvalds/linux.git
synced 2025-11-02 09:40:27 +02:00
btrfs: remove redundant root argument from btrfs_update_inode_item()
The root argument for btrfs_update_inode_item() always matches the root of the given inode, so remove the root argument and get it from the inode argument. Reviewed-by: Qu Wenruo <wqu@suse.com> 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:
parent
8b9d032225
commit
07a274a886
1 changed files with 4 additions and 5 deletions
|
|
@ -3966,8 +3966,7 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,
|
||||||
* copy everything in the in-memory inode into the btree.
|
* copy everything in the in-memory inode into the btree.
|
||||||
*/
|
*/
|
||||||
static noinline int btrfs_update_inode_item(struct btrfs_trans_handle *trans,
|
static noinline int btrfs_update_inode_item(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_root *root,
|
struct btrfs_inode *inode)
|
||||||
struct btrfs_inode *inode)
|
|
||||||
{
|
{
|
||||||
struct btrfs_inode_item *inode_item;
|
struct btrfs_inode_item *inode_item;
|
||||||
struct btrfs_path *path;
|
struct btrfs_path *path;
|
||||||
|
|
@ -3978,7 +3977,7 @@ static noinline int btrfs_update_inode_item(struct btrfs_trans_handle *trans,
|
||||||
if (!path)
|
if (!path)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
ret = btrfs_lookup_inode(trans, root, path, &inode->location, 1);
|
ret = btrfs_lookup_inode(trans, inode->root, path, &inode->location, 1);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
if (ret > 0)
|
if (ret > 0)
|
||||||
ret = -ENOENT;
|
ret = -ENOENT;
|
||||||
|
|
@ -4026,7 +4025,7 @@ int btrfs_update_inode(struct btrfs_trans_handle *trans,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
return btrfs_update_inode_item(trans, root, inode);
|
return btrfs_update_inode_item(trans, inode);
|
||||||
}
|
}
|
||||||
|
|
||||||
int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,
|
int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,
|
||||||
|
|
@ -4036,7 +4035,7 @@ int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,
|
||||||
|
|
||||||
ret = btrfs_update_inode(trans, inode);
|
ret = btrfs_update_inode(trans, inode);
|
||||||
if (ret == -ENOSPC)
|
if (ret == -ENOSPC)
|
||||||
return btrfs_update_inode_item(trans, inode->root, inode);
|
return btrfs_update_inode_item(trans, inode);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue