btrfs: Make btrfs_orphan_add 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 2bfc2e289f514a69dc956deb80fa66e34bac3c89..af68f8452f196f9698cc5a6244b30da60c5f1a82 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3174,7 +3174,8 @@ int btrfs_update_inode(struct btrfs_trans_handle *trans,
                              struct inode *inode);
 int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans,
                                struct btrfs_root *root, struct inode *inode);
-int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode);
+int btrfs_orphan_add(struct btrfs_trans_handle *trans,
+               struct btrfs_inode *inode);
 int btrfs_orphan_cleanup(struct btrfs_root *root);
 void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans,
                              struct btrfs_root *root);

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 7b2313a4441e4bae481a9f68657c3d8044432066..3853fab2f49f5f6a8eb015c37b9afa39bc0f400f 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -10337,7 +10337,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
        mutex_unlock(&trans->transaction->cache_write_mutex);
 
        if (!IS_ERR(inode)) {
-               ret = btrfs_orphan_add(trans, inode);
+               ret = btrfs_orphan_add(trans, BTRFS_I(inode));
                if (ret) {
                        btrfs_add_delayed_iput(inode);
                        goto out;

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index ad93974f86a9bc41b1bf5f370c81a5993d2fdd6c..d5339b8d46637f5e1c0a34978215dd9996bc6d50 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3172,10 +3172,11 @@ void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans,
  * NOTE: caller of this function should reserve 5 units of metadata for
  *      this function.
  */
-int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
+int btrfs_orphan_add(struct btrfs_trans_handle *trans,
+               struct btrfs_inode *inode)
 {
-       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
+       struct btrfs_root *root = inode->root;
        struct btrfs_block_rsv *block_rsv = NULL;
        int reserve = 0;
        int insert = 0;
@@ -3197,7 +3198,7 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
        }
 
        if (!test_and_set_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
-                             &BTRFS_I(inode)->runtime_flags)) {
+                             &inode->runtime_flags)) {
 #if 0
                /*
                 * For proper ENOSPC handling, we should do orphan
@@ -3214,39 +3215,38 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
        }
 
        if (!test_and_set_bit(BTRFS_INODE_ORPHAN_META_RESERVED,
-                             &BTRFS_I(inode)->runtime_flags))
+                             &inode->runtime_flags))
                reserve = 1;
        spin_unlock(&root->orphan_lock);
 
        /* grab metadata reservation from transaction handle */
        if (reserve) {
-               ret = btrfs_orphan_reserve_metadata(trans, BTRFS_I(inode));
+               ret = btrfs_orphan_reserve_metadata(trans, inode);
                ASSERT(!ret);
                if (ret) {
                        atomic_dec(&root->orphan_inodes);
                        clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED,
-                                 &BTRFS_I(inode)->runtime_flags);
+                                 &inode->runtime_flags);
                        if (insert)
                                clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
-                                         &BTRFS_I(inode)->runtime_flags);
+                                         &inode->runtime_flags);
                        return ret;
                }
        }
 
        /* insert an orphan item to track this unlinked/truncated file */
        if (insert >= 1) {
-               ret = btrfs_insert_orphan_item(trans, root,
-                               btrfs_ino(BTRFS_I(inode)));
+               ret = btrfs_insert_orphan_item(trans, root, btrfs_ino(inode));
                if (ret) {
                        atomic_dec(&root->orphan_inodes);
                        if (reserve) {
                                clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED,
-                                         &BTRFS_I(inode)->runtime_flags);
-                               btrfs_orphan_release_metadata(BTRFS_I(inode));
+                                         &inode->runtime_flags);
+                               btrfs_orphan_release_metadata(inode);
                        }
                        if (ret != -EEXIST) {
                                clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
-                                         &BTRFS_I(inode)->runtime_flags);
+                                         &inode->runtime_flags);
                                btrfs_abort_transaction(trans, ret);
                                return ret;
                        }
@@ -3458,7 +3458,7 @@ int btrfs_orphan_cleanup(struct btrfs_root *root)
                                ret = PTR_ERR(trans);
                                goto out;
                        }
-                       ret = btrfs_orphan_add(trans, inode);
+                       ret = btrfs_orphan_add(trans, BTRFS_I(inode));
                        btrfs_end_transaction(trans);
                        if (ret) {
                                iput(inode);
@@ -4060,7 +4060,7 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry)
                goto out;
 
        if (inode->i_nlink == 0) {
-               ret = btrfs_orphan_add(trans, inode);
+               ret = btrfs_orphan_add(trans, BTRFS_I(inode));
                if (ret)
                        goto out;
        }
@@ -4177,7 +4177,7 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
                goto out;
        }
 
-       err = btrfs_orphan_add(trans, inode);
+       err = btrfs_orphan_add(trans, BTRFS_I(inode));
        if (err)
                goto out;
 
@@ -4992,7 +4992,7 @@ static int btrfs_setsize(struct inode *inode, struct iattr *attr)
                 * so we need to guarantee from this point on that everything
                 * will be consistent.
                 */
-               ret = btrfs_orphan_add(trans, inode);
+               ret = btrfs_orphan_add(trans, BTRFS_I(inode));
                btrfs_end_transaction(trans);
                if (ret)
                        return ret;
@@ -9865,7 +9865,8 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                                                 new_dentry->d_name.len);
                }
                if (!ret && new_inode->i_nlink == 0)
-                       ret = btrfs_orphan_add(trans, d_inode(new_dentry));
+                       ret = btrfs_orphan_add(trans,
+                                       BTRFS_I(d_inode(new_dentry)));
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
                        goto out_fail;
@@ -10482,7 +10483,7 @@ static int btrfs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
        ret = btrfs_update_inode(trans, root, inode);
        if (ret)
                goto out_inode;
-       ret = btrfs_orphan_add(trans, inode);
+       ret = btrfs_orphan_add(trans, BTRFS_I(inode));
        if (ret)
                goto out_inode;
 

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index e48625413fcb90ad9fcafab3e078d956cf6a34e9..d60df51959f7abd5f392b5f407ab85558672d10c 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4246,7 +4246,7 @@ struct inode *create_reloc_inode(struct btrfs_fs_info *fs_info,
        BUG_ON(IS_ERR(inode) || is_bad_inode(inode));
        BTRFS_I(inode)->index_cnt = group->key.objectid;
 
-       err = btrfs_orphan_add(trans, inode);
+       err = btrfs_orphan_add(trans, BTRFS_I(inode));
 out:
        btrfs_end_transaction(trans);
        btrfs_btree_balance_dirty(fs_info);