Commit b7519157 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

btrfs: remove super block argument from btrfs_iget_locked()

It's pointless to pass a super block argument to btrfs_iget_locked()
because we always pass a root and from it we can get the super block
through:

   root->fs_info->sb

So remove the super block argument.
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d383eb69
...@@ -5573,8 +5573,7 @@ static int btrfs_find_actor(struct inode *inode, void *opaque) ...@@ -5573,8 +5573,7 @@ static int btrfs_find_actor(struct inode *inode, void *opaque)
args->root == BTRFS_I(inode)->root; args->root == BTRFS_I(inode)->root;
} }
static struct inode *btrfs_iget_locked(struct super_block *s, u64 ino, static struct inode *btrfs_iget_locked(u64 ino, struct btrfs_root *root)
struct btrfs_root *root)
{ {
struct inode *inode; struct inode *inode;
struct btrfs_iget_args args; struct btrfs_iget_args args;
...@@ -5583,7 +5582,7 @@ static struct inode *btrfs_iget_locked(struct super_block *s, u64 ino, ...@@ -5583,7 +5582,7 @@ static struct inode *btrfs_iget_locked(struct super_block *s, u64 ino,
args.ino = ino; args.ino = ino;
args.root = root; args.root = root;
inode = iget5_locked(s, hashval, btrfs_find_actor, inode = iget5_locked(root->fs_info->sb, hashval, btrfs_find_actor,
btrfs_init_locked_inode, btrfs_init_locked_inode,
(void *)&args); (void *)&args);
return inode; return inode;
...@@ -5601,7 +5600,7 @@ struct inode *btrfs_iget_path(u64 ino, struct btrfs_root *root, ...@@ -5601,7 +5600,7 @@ struct inode *btrfs_iget_path(u64 ino, struct btrfs_root *root,
struct inode *inode; struct inode *inode;
int ret; int ret;
inode = btrfs_iget_locked(root->fs_info->sb, ino, root); inode = btrfs_iget_locked(ino, root);
if (!inode) if (!inode)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment