btrfs: drop unused parameter fs_info from btrfs_match_dir_item_name()

Cascaded removal of fs_info that is not needed in several functions.

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 1e8cd7c9472e1d357bea3be3bc62fc14ca0f3878..1ea5d8fcfbf7e343d88452b63e8587e54b25317c 100644 (file)
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -27,7 +27,6 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle
                                                   const char *name,
                                                   int name_len)
 {
-       struct btrfs_fs_info *fs_info = root->fs_info;
        int ret;
        char *ptr;
        struct extent_buffer *leaf;
@@ -35,7 +34,7 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle
        ret = btrfs_insert_empty_item(trans, root, path, cpu_key, data_size);
        if (ret == -EEXIST) {
                struct btrfs_dir_item *di;
-               di = btrfs_match_dir_item_name(fs_info, path, name, name_len);
+               di = btrfs_match_dir_item_name(path, name, name_len);
                if (di)
                        return ERR_PTR(-EEXIST);
                btrfs_extend_item(trans, path, data_size);
@@ -190,7 +189,7 @@ static struct btrfs_dir_item *btrfs_lookup_match_dir(
        if (ret > 0)
                return ERR_PTR(-ENOENT);
 
-       return btrfs_match_dir_item_name(root->fs_info, path, name, name_len);
+       return btrfs_match_dir_item_name(path, name, name_len);
 }
 
 /*
@@ -341,8 +340,7 @@ btrfs_search_dir_index_item(struct btrfs_root *root, struct btrfs_path *path,
                if (key.objectid != dirid || key.type != BTRFS_DIR_INDEX_KEY)
                        break;
 
-               di = btrfs_match_dir_item_name(root->fs_info, path,
-                                              name->name, name->len);
+               di = btrfs_match_dir_item_name(path, name->name, name->len);
                if (di)
                        return di;
        }
@@ -378,8 +376,7 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans,
  * this walks through all the entries in a dir item and finds one
  * for a specific name.
  */
-struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,
-                                                const struct btrfs_path *path,
+struct btrfs_dir_item *btrfs_match_dir_item_name(const struct btrfs_path *path,
                                                 const char *name, int name_len)
 {
        struct btrfs_dir_item *dir_item;

diff --git a/fs/btrfs/dir-item.h b/fs/btrfs/dir-item.h
index 5f6dfafc91f1feed8bb1a334315ef232b05f58f9..28d69970bc709fd39c8854a3fce5008dbf5c13ad 100644 (file)
--- a/fs/btrfs/dir-item.h
+++ b/fs/btrfs/dir-item.h
@@ -44,8 +44,7 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans,
                                          struct btrfs_path *path, u64 dir,
                                          const char *name, u16 name_len,
                                          int mod);
-struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_fs_info *fs_info,
-                                                const struct btrfs_path *path,
+struct btrfs_dir_item *btrfs_match_dir_item_name(const struct btrfs_path *path,
                                                 const char *name,
                                                 int name_len);
 

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index efbe1c08a5adaee6e2e13bb1f67f0c03883f4462..03b31b1c39be298fc59ffb4da742260fc21f63a3 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -3760,7 +3760,6 @@ static int wait_for_dest_dir_move(struct send_ctx *sctx,
                                  struct recorded_ref *parent_ref,
                                  const bool is_orphan)
 {
-       struct btrfs_fs_info *fs_info = sctx->parent_root->fs_info;
        struct btrfs_path *path;
        struct btrfs_key key;
        struct btrfs_key di_key;
@@ -3789,7 +3788,7 @@ static int wait_for_dest_dir_move(struct send_ctx *sctx,
                goto out;
        }
 
-       di = btrfs_match_dir_item_name(fs_info, path, parent_ref->name,
+       di = btrfs_match_dir_item_name(path, parent_ref->name,
                                       parent_ref->name_len);
        if (!di) {
                ret = 0;

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index ce464cd8e0ac79c99557836071b93dada51e1018..bc18710d1dcfbbf015c6390959dcc47c1226019b 100644 (file)
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -85,7 +85,6 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
 {
        struct btrfs_dir_item *di = NULL;
        struct btrfs_root *root = BTRFS_I(inode)->root;
-       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_path *path;
        size_t name_len = strlen(name);
        int ret = 0;
@@ -143,14 +142,14 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
                 */
                ret = 0;
                btrfs_assert_tree_write_locked(path->nodes[0]);
-               di = btrfs_match_dir_item_name(fs_info, path, name, name_len);
+               di = btrfs_match_dir_item_name(path, name, name_len);
                if (!di && !(flags & XATTR_REPLACE)) {
                        ret = -ENOSPC;
                        goto out;
                }
        } else if (ret == -EEXIST) {
                ret = 0;
-               di = btrfs_match_dir_item_name(fs_info, path, name, name_len);
+               di = btrfs_match_dir_item_name(path, name, name_len);
                ASSERT(di); /* logic error */
        } else if (ret) {
                goto out;