btrfs: Make btrfs_i_size_write take btrfs_inode

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 819a6d27218a902c6149ae73576afb90fe31b467..46d117b77bd286202135a9b038cbcf3e18f0e8d6 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -237,10 +237,10 @@ static inline u64 btrfs_ino(struct btrfs_inode *inode)
        return ino;
 }
 
-static inline void btrfs_i_size_write(struct inode *inode, u64 size)
+static inline void btrfs_i_size_write(struct btrfs_inode *inode, u64 size)
 {
-       i_size_write(inode, size);
-       BTRFS_I(inode)->disk_i_size = size;
+       i_size_write(&inode->vfs_inode, size);
+       inode->disk_i_size = size;
 }
 
 static inline bool btrfs_is_free_space_inode(struct inode *inode)

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index f7a6ee5ccc809a0ccf8338e058fec98b9d98da33..1aff676f0e5b5b6c63efd32eee44958b40968e2a 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1790,7 +1790,7 @@ int btrfs_fill_inode(struct inode *inode, u32 *rdev)
 
        i_uid_write(inode, btrfs_stack_inode_uid(inode_item));
        i_gid_write(inode, btrfs_stack_inode_gid(inode_item));
-       btrfs_i_size_write(inode, btrfs_stack_inode_size(inode_item));
+       btrfs_i_size_write(BTRFS_I(inode), btrfs_stack_inode_size(inode_item));
        inode->i_mode = btrfs_stack_inode_mode(inode_item);
        set_nlink(inode, btrfs_stack_inode_nlink(inode_item));
        inode_set_bytes(inode, btrfs_stack_inode_nbytes(inode_item));

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 1a131f7d6c1bed3f751c4f25835216d0b0910ad4..c0f313cbbbf2c2a93f725f87979b52fd5354ea57 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -260,7 +260,7 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans,
                btrfs_free_path(path);
        }
 
-       btrfs_i_size_write(inode, 0);
+       btrfs_i_size_write(BTRFS_I(inode), 0);
        truncate_pagecache(inode, 0);
 
        /*

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index d4ba1c4235dea5dcb1e7ef931003ee491efd9d96..4e9407a014d9a49de3868711586d58325f4b4816 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3617,7 +3617,7 @@ static int btrfs_read_locked_inode(struct inode *inode)
        set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
        i_uid_write(inode, btrfs_inode_uid(leaf, inode_item));
        i_gid_write(inode, btrfs_inode_gid(leaf, inode_item));
-       btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
+       btrfs_i_size_write(BTRFS_I(inode), btrfs_inode_size(leaf, inode_item));
 
        inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime);
        inode->i_atime.tv_nsec = btrfs_timespec_nsec(leaf, &inode_item->atime);
@@ -3988,8 +3988,7 @@ err:
        if (ret)
                goto out;
 
-       btrfs_i_size_write(&dir->vfs_inode,
-                       dir->vfs_inode.i_size - name_len * 2);
+       btrfs_i_size_write(dir, dir->vfs_inode.i_size - name_len * 2);
        inode_inc_iversion(&inode->vfs_inode);
        inode_inc_iversion(&dir->vfs_inode);
        inode->vfs_inode.i_ctime = dir->vfs_inode.i_mtime =
@@ -4137,7 +4136,7 @@ int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,
                goto out;
        }
 
-       btrfs_i_size_write(dir, dir->i_size - name_len * 2);
+       btrfs_i_size_write(BTRFS_I(dir), dir->i_size - name_len * 2);
        inode_inc_iversion(dir);
        dir->i_mtime = dir->i_ctime = current_time(dir);
        ret = btrfs_update_inode_fallback(trans, root, dir);
@@ -4184,7 +4183,7 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
                        BTRFS_I(d_inode(dentry)), dentry->d_name.name,
                        dentry->d_name.len);
        if (!err) {
-               btrfs_i_size_write(inode, 0);
+               btrfs_i_size_write(BTRFS_I(inode), 0);
                /*
                 * Propagate the last_unlink_trans value of the deleted dir to
                 * its parent directory. This is to prevent an unrecoverable
@@ -5221,7 +5220,7 @@ void btrfs_evict_inode(struct inode *inode)
        rsv->failfast = 1;
        global_rsv = &fs_info->global_block_rsv;
 
-       btrfs_i_size_write(inode, 0);
+       btrfs_i_size_write(BTRFS_I(inode), 0);
 
        /*
         * This is a bit simpler than btrfs_truncate since we've already
@@ -6285,7 +6284,7 @@ int btrfs_add_link(struct btrfs_trans_handle *trans,
                return ret;
        }
 
-       btrfs_i_size_write(parent_inode, parent_inode->i_size +
+       btrfs_i_size_write(BTRFS_I(parent_inode), parent_inode->i_size +
                           name_len * 2);
        inode_inc_iversion(parent_inode);
        parent_inode->i_mtime = parent_inode->i_ctime =
@@ -6589,7 +6588,7 @@ static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
        if (err)
                goto out_fail_inode;
 
-       btrfs_i_size_write(inode, 0);
+       btrfs_i_size_write(BTRFS_I(inode), 0);
        err = btrfs_update_inode(trans, root, inode);
        if (err)
                goto out_fail_inode;
@@ -9205,7 +9204,7 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
        inode->i_fop = &btrfs_dir_file_operations;
 
        set_nlink(inode, 1);
-       btrfs_i_size_write(inode, 0);
+       btrfs_i_size_write(BTRFS_I(inode), 0);
        unlock_new_inode(inode);
 
        err = btrfs_subvol_inherit_props(trans, new_root, parent_root);
@@ -10232,7 +10231,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry,
        inode_nohighmem(inode);
        inode->i_mapping->a_ops = &btrfs_symlink_aops;
        inode_set_bytes(inode, name_len);
-       btrfs_i_size_write(inode, name_len);
+       btrfs_i_size_write(BTRFS_I(inode), name_len);
        err = btrfs_update_inode(trans, root, inode);
        /*
         * Last step, add directory indexes for our symlink inode. This is the

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 628d1b180ceef452190b2aa7532f1900b4ba1fee..86f993c958bae7895ccf6722c0aa7db408ebbf0a 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -594,7 +594,7 @@ static noinline int create_subvol(struct inode *dir,
                goto fail;
        }
 
-       btrfs_i_size_write(dir, dir->i_size + namelen * 2);
+       btrfs_i_size_write(BTRFS_I(dir), dir->i_size + namelen * 2);
        ret = btrfs_update_inode(trans, root, dir);
        BUG_ON(ret);
 
@@ -3298,7 +3298,7 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans,
        if (endoff > destoff + olen)
                endoff = destoff + olen;
        if (endoff > inode->i_size)
-               btrfs_i_size_write(inode, endoff);
+               btrfs_i_size_write(BTRFS_I(inode), endoff);
 
        ret = btrfs_update_inode(trans, root, inode);
        if (ret) {

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 05c2bbff2a2814796d3ebf830f6fbcfb077358c3..61b807de3e164e38877230cdfd1e9a545573f1be 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1653,7 +1653,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
                goto fail;
        }
 
-       btrfs_i_size_write(parent_inode, parent_inode->i_size +
+       btrfs_i_size_write(BTRFS_I(parent_inode), parent_inode->i_size +
                                         dentry->d_name.len * 2);
        parent_inode->i_mtime = parent_inode->i_ctime =
                current_time(parent_inode);

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index cf45b264cff3d89b83d34a9efb5153243ceea3ef..071f6494471194816d5680d4a73410fef2b32524 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1780,7 +1780,7 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans,
 out:
        btrfs_release_path(path);
        if (!ret && update_size) {
-               btrfs_i_size_write(dir, dir->i_size + name_len * 2);
+               btrfs_i_size_write(BTRFS_I(dir), dir->i_size + name_len * 2);
                ret = btrfs_update_inode(trans, root, dir);
        }
        kfree(name);