btrfs: Make btrfs_insert_delayed_dir_index take btrfs_inode

Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index aa7032d1c5ae640af4bf9e96bf7ef8638e116929..a944b6c01053d4684ec26fd836181d700669fe2c 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1432,7 +1432,7 @@ void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info)
 int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
                                   struct btrfs_fs_info *fs_info,
                                   const char *name, int name_len,
-                                  struct inode *dir,
+                                  struct btrfs_inode *dir,
                                   struct btrfs_disk_key *disk_key, u8 type,
                                   u64 index)
 {
@@ -1441,7 +1441,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
        struct btrfs_dir_item *dir_item;
        int ret;
 
-       delayed_node = btrfs_get_or_create_delayed_node(BTRFS_I(dir));
+       delayed_node = btrfs_get_or_create_delayed_node(dir);
        if (IS_ERR(delayed_node))
                return PTR_ERR(delayed_node);
 
@@ -1451,7 +1451,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
                goto release_node;
        }
 
-       delayed_item->key.objectid = btrfs_ino(BTRFS_I(dir));
+       delayed_item->key.objectid = btrfs_ino(dir);
        delayed_item->key.type = BTRFS_DIR_INDEX_KEY;
        delayed_item->key.offset = index;
 

diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
index 8a2bf5e3e4cf6960fa0c6d9fe911cd3f8a79ea90..3cbd9bb79713c7dbfe52b7396670120dca9cdcf4 100644 (file)
--- a/fs/btrfs/delayed-inode.h
+++ b/fs/btrfs/delayed-inode.h
@@ -101,7 +101,7 @@ static inline void btrfs_init_delayed_root(
 int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
                                   struct btrfs_fs_info *fs_info,
                                   const char *name, int name_len,
-                                  struct inode *dir,
+                                  struct btrfs_inode *dir,
                                   struct btrfs_disk_key *disk_key, u8 type,
                                   u64 index);
 

diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 74de492bd4900e61434d9b583ea46f8f0150c1bd..2c2b707567e46e18958b6b84f41bafe303b6f986 100644 (file)
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -174,7 +174,7 @@ second_insert:
        btrfs_release_path(path);
 
        ret2 = btrfs_insert_delayed_dir_index(trans, root->fs_info, name,
-                                             name_len, dir, &disk_key, type,
+                                             name_len, BTRFS_I(dir), &disk_key, type,
                                              index);
 out_free:
        btrfs_free_path(path);