btrfs: Make btrfs_orphan_reserve_metadata 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 76e661d008223a7739174123abfe0d92db8fb0a2..52af63e1d9a0a414165ac76ddf8f1454ca35c557 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2695,7 +2695,7 @@ void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,
                                  struct btrfs_fs_info *fs_info);
 void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans);
 int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
-                                 struct inode *inode);
+                                 struct btrfs_inode *inode);
 void btrfs_orphan_release_metadata(struct inode *inode);
 int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
                                     struct btrfs_block_rsv *rsv,

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 1fe0626852531b34403f967cfe5f880934a91668..8156964abc10e79f8dcd84613c14094d0a1be966 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5742,10 +5742,10 @@ void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans)
 
 /* Can only return 0 or -ENOSPC */
 int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
-                                 struct inode *inode)
+                                 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;
        /*
         * We always use trans->block_rsv here as we will have reserved space
         * for our orphan when starting the transaction, using get_block_rsv()
@@ -5762,8 +5762,8 @@ int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
         */
        u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);
 
-       trace_btrfs_space_reservation(fs_info, "orphan",
-                                     btrfs_ino(BTRFS_I(inode)), num_bytes, 1);
+       trace_btrfs_space_reservation(fs_info, "orphan", btrfs_ino(inode), 
+                       num_bytes, 1);
        return btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1);
 }
 

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index a465a927395e894ae88b901fbf67a828d58a0a76..12345d4f25a53a4f404405120f4d8e4fc04d565b 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3215,7 +3215,7 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
 
        /* grab metadata reservation from transaction handle */
        if (reserve) {
-               ret = btrfs_orphan_reserve_metadata(trans, inode);
+               ret = btrfs_orphan_reserve_metadata(trans, BTRFS_I(inode));
                ASSERT(!ret);
                if (ret) {
                        atomic_dec(&root->orphan_inodes);