Unionfs: use i_size wrappers

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index ba845298aaa2b6c305dfac7e885d8bff7dc0ed65..624f920ff6a2bcf2eddce2c64bdcdbb1b58be053 100644 (file)
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -72,7 +72,8 @@ retry:
        dput(tmp_dentry);
 
        err = copyup_named_file(dentry->d_parent->d_inode, file, name, bstart,
-                               bindex, file->f_path.dentry->d_inode->i_size);
+                               bindex,
+                               i_size_read(file->f_path.dentry->d_inode));
        if (err) {
                if (unlikely(err == -EEXIST))
                        goto retry;
@@ -199,7 +200,6 @@ static int open_highest_file(struct file *file, bool willwrite)
        struct dentry *dentry = file->f_path.dentry;
        struct inode *parent_inode = dentry->d_parent->d_inode;
        struct super_block *sb = dentry->d_sb;
-       size_t inode_size = dentry->d_inode->i_size;
 
        bstart = dbstart(dentry);
        bend = dbend(dentry);
@@ -208,7 +208,7 @@ static int open_highest_file(struct file *file, bool willwrite)
        if (willwrite && IS_WRITE_FLAG(file->f_flags) && is_robranch(dentry)) {
                for (bindex = bstart - 1; bindex >= 0; bindex--) {
                        err = copyup_file(parent_inode, file, bstart, bindex,
-                                         inode_size);
+                                         i_size_read(dentry->d_inode));
                        if (!err)
                                break;
                }
@@ -243,7 +243,6 @@ static int do_delayed_copyup(struct file *file)
        int bindex, bstart, bend, err = 0;
        struct dentry *dentry = file->f_path.dentry;
        struct inode *parent_inode = dentry->d_parent->d_inode;
-       loff_t inode_size = dentry->d_inode->i_size;
 
        bstart = fbstart(file);
        bend = fbend(file);
@@ -255,7 +254,8 @@ static int do_delayed_copyup(struct file *file)
        for (bindex = bstart - 1; bindex >= 0; bindex--) {
                if (!d_deleted(dentry))
                        err = copyup_file(parent_inode, file, bstart,
-                                         bindex, inode_size);
+                                         bindex,
+                                         i_size_read(dentry->d_inode));
                else
                        err = copyup_deleted_file(file, dentry, bstart,
                                                  bindex);

diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index bcefe451e25f18740227bc99316731464bf1ad68..223a64a5e8a2cafa7a7438eaa09fb19663c3352e 100644 (file)
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -312,7 +312,7 @@ docopyup:
                                            old_dentry, old_bstart,
                                            bindex, old_dentry->d_name.name,
                                            old_dentry->d_name.len, NULL,
-                                           old_dentry->d_inode->i_size);
+                                           i_size_read(old_dentry->d_inode));
                        if (!err) {
                                lower_new_dentry =
                                        create_parents(dir, new_dentry,
@@ -1043,7 +1043,7 @@ static int unionfs_setattr(struct dentry *dentry, struct iattr *ia)
                                continue;
                        /* Only if its the leftmost file, copyup the file */
                        for (i = bstart - 1; i >= 0; i--) {
-                               loff_t size = dentry->d_inode->i_size;
+                               loff_t size = i_size_read(dentry->d_inode);
                                if (ia->ia_valid & ATTR_SIZE)
                                        size = ia->ia_size;
                                err = copyup_dentry(dentry->d_parent->d_inode,

diff --git a/fs/unionfs/rdstate.c b/fs/unionfs/rdstate.c
index 0df5f52795b8d5380954754645c6d2531abb1725..bdf335d36560db99eec2236a4413adc1f5dcd0de 100644 (file)
--- a/fs/unionfs/rdstate.c
+++ b/fs/unionfs/rdstate.c
@@ -76,10 +76,10 @@ static int guesstimate_hash_size(struct inode *inode)
                if (!lower_inode)
                        continue;
 
-               if (lower_inode->i_size == DENTPAGE)
+               if (i_size_read(lower_inode) == DENTPAGE)
                        hashsize += DENTPERONEPAGE;
                else
-                       hashsize += (lower_inode->i_size / DENTPAGE) *
+                       hashsize += (i_size_read(lower_inode) / DENTPAGE) *
                                DENTPERPAGE;
        }
 

diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index 4a35b5eb6913bf011b6c5105968a219ca126a442..452d1e7778298f9d52f0851e8ba5ae481df4b64b 100644 (file)
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -234,8 +234,8 @@ static int do_unionfs_rename(struct inode *old_dir,
                        err = copyup_dentry(old_dentry->d_parent->d_inode,
                                            old_dentry, old_bstart, bindex,
                                            old_dentry->d_name.name,
-                                           old_dentry->d_name.len,
-                                           NULL, old_dentry->d_inode->i_size);
+                                           old_dentry->d_name.len, NULL,
+                                           i_size_read(old_dentry->d_inode));
                        /* if copyup failed, try next branch to the left */
                        if (err)
                                continue;

diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 7d28045bdda114098412434a48417b8de9048f5c..70487bf700082a9ee8658f13414639bd4931acbc 100644 (file)
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -69,7 +69,7 @@ static void unionfs_read_inode(struct inode *inode)
  */
 static void unionfs_delete_inode(struct inode *inode)
 {
-       inode->i_size = 0;      /* every f/s seems to do that */
+       i_size_write(inode, 0); /* every f/s seems to do that */
 
        if (inode->i_data.nrpages)
                truncate_inode_pages(&inode->i_data, 0);