btrfs: Make btrfs_del_inode_ref 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/inode.c b/fs/btrfs/inode.c
index 9a2b55eb6f732dc7eb836ae322ca052340a62a34..192745774f0eae8942ee167fefed7d14e3b8332a 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4053,7 +4053,7 @@ skip_backref:
        }
 
        ret = btrfs_del_inode_ref_in_log(trans, root, name, name_len,
-                                        inode, dir_ino);
+                                        BTRFS_I(inode), dir_ino);
        if (ret != 0 && ret != -ENOENT) {
                btrfs_abort_transaction(trans, ret);
                goto err;

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index caa8d886b4ae10a4169c68fd0a4d4301fb1778a5..a7705173150e3437a7dd56ae91855708b95c637a 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3192,25 +3192,25 @@ out_unlock:
 int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
                               struct btrfs_root *root,
                               const char *name, int name_len,
-                              struct inode *inode, u64 dirid)
+                              struct btrfs_inode *inode, u64 dirid)
 {
        struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_root *log;
        u64 index;
        int ret;
 
-       if (BTRFS_I(inode)->logged_trans < trans->transid)
+       if (inode->logged_trans < trans->transid)
                return 0;
 
        ret = join_running_log_trans(root);
        if (ret)
                return 0;
        log = root->log_root;
-       mutex_lock(&BTRFS_I(inode)->log_mutex);
+       mutex_lock(&inode->log_mutex);
 
-       ret = btrfs_del_inode_ref(trans, log, name, name_len, btrfs_ino(BTRFS_I(inode)),
+       ret = btrfs_del_inode_ref(trans, log, name, name_len, btrfs_ino(inode),
                                  dirid, &index);
-       mutex_unlock(&BTRFS_I(inode)->log_mutex);
+       mutex_unlock(&inode->log_mutex);
        if (ret == -ENOSPC) {
                btrfs_set_log_full_commit(fs_info, trans);
                ret = 0;

diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
index 41679397ce6eaad16a6c931bd9d5845b9e08cb26..483027f9a7f4f8dbc469c54c04ab47b4a9b4a116 100644 (file)
--- a/fs/btrfs/tree-log.h
+++ b/fs/btrfs/tree-log.h
@@ -76,7 +76,7 @@ int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
 int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
                               struct btrfs_root *root,
                               const char *name, int name_len,
-                              struct inode *inode, u64 dirid);
+                              struct btrfs_inode *inode, u64 dirid);
 void btrfs_end_log_trans(struct btrfs_root *root);
 int btrfs_pin_log_trans(struct btrfs_root *root);
 void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,