btrfs: use struct btrfs_inode inside create_pending_snapshot()

Use a struct btrfs_inode in create_pending_snapshot() as it's an
internal helper, allowing to remove some use of BTRFS_I.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 47b2f7172374529ef92c7d2ee73d919d2d348ca8..db8fe291d01059b105c7afac037f15eeef17f532 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1635,7 +1635,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
        struct btrfs_root *root = pending->root;
        struct btrfs_root *parent_root;
        struct btrfs_block_rsv *rsv;
-       struct inode *parent_inode = &pending->dir->vfs_inode;
+       struct btrfs_inode *parent_inode = pending->dir;
        struct btrfs_path *path;
        struct btrfs_dir_item *dir_item;
        struct extent_buffer *tmp;
@@ -1661,7 +1661,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
         * filesystem.
         */
        nofs_flags = memalloc_nofs_save();
-       pending->error = fscrypt_setup_filename(parent_inode,
+       pending->error = fscrypt_setup_filename(&parent_inode->vfs_inode,
                                                &pending->dentry->d_name, 0,
                                                &fname);
        memalloc_nofs_restore(nofs_flags);
@@ -1699,16 +1699,16 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
        trace_btrfs_space_reservation(fs_info, "transaction",
                                      trans->transid,
                                      trans->bytes_reserved, 1);
-       parent_root = BTRFS_I(parent_inode)->root;
+       parent_root = parent_inode->root;
        ret = record_root_in_trans(trans, parent_root, 0);
        if (ret)
                goto fail;
-       cur_time = current_time(parent_inode);
+       cur_time = current_time(&parent_inode->vfs_inode);
 
        /*
         * insert the directory item
         */
-       ret = btrfs_set_inode_index(BTRFS_I(parent_inode), &index);
+       ret = btrfs_set_inode_index(parent_inode, &index);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
                goto fail;
@@ -1716,7 +1716,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
 
        /* check if there is a file/dir which has the same name. */
        dir_item = btrfs_lookup_dir_item(NULL, parent_root, path,
-                                        btrfs_ino(BTRFS_I(parent_inode)),
+                                        btrfs_ino(parent_inode),
                                         &fname.disk_name, 0);
        if (dir_item != NULL && !IS_ERR(dir_item)) {
                pending->error = -EEXIST;
@@ -1817,7 +1817,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
         */
        ret = btrfs_add_root_ref(trans, objectid,
                                 btrfs_root_id(parent_root),
-                                btrfs_ino(BTRFS_I(parent_inode)), index,
+                                btrfs_ino(parent_inode), index,
                                 &fname.disk_name);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
@@ -1855,18 +1855,18 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
                goto fail;
 
        ret = btrfs_insert_dir_item(trans, &fname.disk_name,
-                                   BTRFS_I(parent_inode), &key, BTRFS_FT_DIR,
+                                   parent_inode, &key, BTRFS_FT_DIR,
                                    index);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
                goto fail;
        }
 
-       btrfs_i_size_write(BTRFS_I(parent_inode), parent_inode->i_size +
+       btrfs_i_size_write(parent_inode, parent_inode->vfs_inode.i_size +
                                                  fname.disk_name.len * 2);
-       inode_set_mtime_to_ts(parent_inode,
-                             inode_set_ctime_current(parent_inode));
-       ret = btrfs_update_inode_fallback(trans, BTRFS_I(parent_inode));
+       inode_set_mtime_to_ts(&parent_inode->vfs_inode,
+                             inode_set_ctime_current(&parent_inode->vfs_inode));
+       ret = btrfs_update_inode_fallback(trans, parent_inode);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
                goto fail;