diff mbox series

[4/4] btrfs: remove super block argument from btrfs_iget_locked()

Message ID bc57111ab84d909339f77cedaecb3e3a6088189d.1718276261.git.fdmanana@suse.com (mailing list archive)
State New, archived
Headers show
Series btrfs: fix a deadlock with reclaim during logging/log replay | expand

Commit Message

Filipe Manana June 13, 2024, 11:05 a.m. UTC
From: Filipe Manana <fdmanana@suse.com>

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


So remove the super block argument.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
 fs/btrfs/inode.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 43cedb8ff14c..d6c43120c5d3 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5573,8 +5573,7 @@  static int btrfs_find_actor(struct inode *inode, void *opaque)
 		args->root == BTRFS_I(inode)->root;
-static struct inode *btrfs_iget_locked(struct super_block *s, u64 ino,
-				       struct btrfs_root *root)
+static struct inode *btrfs_iget_locked(u64 ino, struct btrfs_root *root)
 	struct inode *inode;
 	struct btrfs_iget_args args;
@@ -5583,7 +5582,7 @@  static struct inode *btrfs_iget_locked(struct super_block *s, u64 ino,
 	args.ino = ino;
 	args.root = root;
-	inode = iget5_locked(s, hashval, btrfs_find_actor,
+	inode = iget5_locked(root->fs_info->sb, hashval, btrfs_find_actor,
 			     (void *)&args);
 	return inode;
@@ -5601,7 +5600,7 @@  struct inode *btrfs_iget_path(u64 ino, struct btrfs_root *root,
 	struct inode *inode;
 	int ret;
-	inode = btrfs_iget_locked(root->fs_info->sb, ino, root);
+	inode = btrfs_iget_locked(ino, root);
 	if (!inode)
 		return ERR_PTR(-ENOMEM);