btrfs: Make btrfs_ino take a struct btrfs_inode

Currently btrfs_ino takes a struct inode and this causes a lot of
internal btrfs functions which consume this ino to take a VFS inode,
rather than btrfs' own struct btrfs_inode. In order to fix this "leak"
of VFS structs into the internals of btrfs first it's necessary to
eliminate all uses of struct inode for the purpose of inode. This patch
does that by using BTRFS_I to convert an inode to btrfs_inode. With
this problem eliminated subsequent patches will start eliminating the
passing of struct inode altogether, eventually resulting in a lot cleaner
code.

Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
[ fix btrfs_get_extent tracepoint prototype ]
Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index fe8b585ea13b..03bd53845360 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -601,7 +601,7 @@ static noinline int create_subvol(struct inode *dir,
 
         ret = btrfs_add_root_ref(trans, fs_info,
                                  objectid, root->root_key.objectid,
-                                 btrfs_ino(dir), index, name, namelen);
+                                 btrfs_ino(BTRFS_I(dir)), index, name, namelen);
         BUG_ON(ret);
 
         ret = btrfs_uuid_tree_add(trans, fs_info, root_item->uuid,
@@ -941,7 +941,7 @@ static int find_new_extents(struct btrfs_root *root,
         struct btrfs_file_extent_item *extent;
         int type;
         int ret;
-        u64 ino = btrfs_ino(inode);
+        u64 ino = btrfs_ino(BTRFS_I(inode));
 
         path = btrfs_alloc_path();
         if (!path)
@@ -1780,7 +1780,7 @@ static noinline int btrfs_ioctl_subvol_getflags(struct file *file,
         int ret = 0;
         u64 flags = 0;
 
-        if (btrfs_ino(inode) != BTRFS_FIRST_FREE_OBJECTID)
+        if (btrfs_ino(BTRFS_I(inode)) != BTRFS_FIRST_FREE_OBJECTID)
                 return -EINVAL;
 
         down_read(&fs_info->subvol_sem);
@@ -1812,7 +1812,7 @@ static noinline int btrfs_ioctl_subvol_setflags(struct file *file,
         if (ret)
                 goto out;
 
-        if (btrfs_ino(inode) != BTRFS_FIRST_FREE_OBJECTID) {
+        if (btrfs_ino(BTRFS_I(inode)) != BTRFS_FIRST_FREE_OBJECTID) {
                 ret = -EINVAL;
                 goto out_drop_write;
         }
@@ -2446,7 +2446,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
         if (err)
                 goto out_dput;
 
-        if (btrfs_ino(inode) != BTRFS_FIRST_FREE_OBJECTID) {
+        if (btrfs_ino(BTRFS_I(inode)) != BTRFS_FIRST_FREE_OBJECTID) {
                 err = -EINVAL;
                 goto out_dput;
         }
@@ -3417,7 +3417,7 @@ static int clone_copy_inline_extent(struct inode *src,
         if (new_key->offset > 0)
                 return -EOPNOTSUPP;
 
-        key.objectid = btrfs_ino(dst);
+        key.objectid = btrfs_ino(BTRFS_I(dst));
         key.type = BTRFS_EXTENT_DATA_KEY;
         key.offset = 0;
         ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
@@ -3432,7 +3432,7 @@ static int clone_copy_inline_extent(struct inode *src,
                                 goto copy_inline_extent;
                 }
                 btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
-                if (key.objectid == btrfs_ino(dst) &&
+                if (key.objectid == btrfs_ino(BTRFS_I(dst)) &&
                     key.type == BTRFS_EXTENT_DATA_KEY) {
                         ASSERT(key.offset > 0);
                         return -EOPNOTSUPP;
@@ -3466,7 +3466,7 @@ static int clone_copy_inline_extent(struct inode *src,
                 } else if (ret == 0) {
                         btrfs_item_key_to_cpu(path->nodes[0], &key,
                                               path->slots[0]);
-                        if (key.objectid == btrfs_ino(dst) &&
+                        if (key.objectid == btrfs_ino(BTRFS_I(dst)) &&
                             key.type == BTRFS_EXTENT_DATA_KEY)
                                 return -EOPNOTSUPP;
                 }
@@ -3560,7 +3560,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
 
         path->reada = READA_FORWARD;
         /* clone data */
-        key.objectid = btrfs_ino(src);
+        key.objectid = btrfs_ino(BTRFS_I(src));
         key.type = BTRFS_EXTENT_DATA_KEY;
         key.offset = off;
 
@@ -3603,7 +3603,7 @@ process_slot:
 
                 btrfs_item_key_to_cpu(leaf, &key, slot);
                 if (key.type > BTRFS_EXTENT_DATA_KEY ||
-                    key.objectid != btrfs_ino(src))
+                    key.objectid != btrfs_ino(BTRFS_I(src)))
                         break;
 
                 if (key.type == BTRFS_EXTENT_DATA_KEY) {
@@ -3656,7 +3656,7 @@ process_slot:
                         path->leave_spinning = 0;
 
                         memcpy(&new_key, &key, sizeof(new_key));
-                        new_key.objectid = btrfs_ino(inode);
+                        new_key.objectid = btrfs_ino(BTRFS_I(inode));
                         if (off <= key.offset)
                                 new_key.offset = key.offset + destoff - off;
                         else
@@ -3746,7 +3746,7 @@ process_slot:
                                                         fs_info,
                                                         disko, diskl, 0,
                                                         root->root_key.objectid,
-                                                        btrfs_ino(inode),
+                                                        btrfs_ino(BTRFS_I(inode)),
                                                         new_key.offset - datao);
                                         if (ret) {
                                                 btrfs_abort_transaction(trans,
@@ -5126,7 +5126,7 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
 
         down_write(&fs_info->subvol_sem);
 
-        if (btrfs_ino(inode) != BTRFS_FIRST_FREE_OBJECTID) {
+        if (btrfs_ino(BTRFS_I(inode)) != BTRFS_FIRST_FREE_OBJECTID) {
                 ret = -EINVAL;
                 goto out;
         }