btrfs: Make btrfs_insert_dir_item take btrfs_inode

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index ad23a73ac7e7f5e712f2dc4af5b87b5c60fb14cb..97f84a80b47952cee04e47d7fb10f28047805510 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2982,7 +2982,7 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
                          const char *name, int name_len);
 int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,
                          struct btrfs_root *root, const char *name,
-                         int name_len, struct inode *dir,
+                         int name_len, struct btrfs_inode *dir,
                          struct btrfs_key *location, u8 type, u64 index);
 struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,
                                             struct btrfs_root *root,

diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 724504a2d7ac56986cc67db5da8521353a049636..b13d9536d4de8c523b7da16d9b782954d8746377 100644 (file)
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -120,7 +120,7 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans,
  */
 int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
                          *root, const char *name, int name_len,
-                         struct inode *dir, struct btrfs_key *location,
+                         struct btrfs_inode *dir, struct btrfs_key *location,
                          u8 type, u64 index)
 {
        int ret = 0;
@@ -133,7 +133,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
        struct btrfs_disk_key disk_key;
        u32 data_size;
 
-       key.objectid = btrfs_ino(BTRFS_I(dir));
+       key.objectid = btrfs_ino(dir);
        key.type = BTRFS_DIR_ITEM_KEY;
        key.offset = btrfs_name_hash(name, name_len);
 
@@ -174,7 +174,7 @@ second_insert:
        btrfs_release_path(path);
 
        ret2 = btrfs_insert_delayed_dir_index(trans, root->fs_info, name,
-                       name_len, BTRFS_I(dir), &disk_key, type, index);
+                       name_len, dir, &disk_key, type, index);
 out_free:
        btrfs_free_path(path);
        if (ret)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index c38391e948d97e3a8bd9c08bf76f0ca75a858325..a23391b52ab17e2fac23f88f9c73c1556c6a0814 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6276,7 +6276,7 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,
                return ret;
 
        ret = btrfs_insert_dir_item(trans, root, name, name_len,
-                                   parent_inode, &key,
+                                   BTRFS_I(parent_inode), &key,
                                    btrfs_inode_type(inode), index);
        if (ret == -EEXIST || ret == -EOVERFLOW)
                goto fail_dir_item;

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index d8539979b44ff22609903cad4c8fd3dba882f65c..a55361d9554d8ee476068449b5f4bed3f4c5c128 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -587,7 +587,7 @@ static noinline int create_subvol(struct inode *dir,
        }
 
        ret = btrfs_insert_dir_item(trans, root,
-                                   name, namelen, dir, &key,
+                                   name, namelen, BTRFS_I(dir), &key,
                                    BTRFS_FT_DIR, index);
        if (ret) {
                btrfs_abort_transaction(trans, ret);

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 6b3e0fc2fe7ac28affd1f966b6e5c08f7493d805..294563216dd3a3a78428aa3acc141f6dd7ab5ae7 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1644,7 +1644,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
 
        ret = btrfs_insert_dir_item(trans, parent_root,
                                    dentry->d_name.name, dentry->d_name.len,
-                                   parent_inode, &key,
+                                   BTRFS_I(parent_inode), &key,
                                    BTRFS_FT_DIR, index);
        /* We have check then name at the beginning, so it is impossible. */
        BUG_ON(ret == -EEXIST || ret == -EOVERFLOW);