1 files changed, 11 insertions, 12 deletions

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 85ff859d3af5..72b779bc0942 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -538,7 +538,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb,
         if (retval)
                 goto error;
 
-        v9fs_stat2inode(st, inode, sb);
+        v9fs_stat2inode(st, inode, sb, 0);
         v9fs_cache_inode_get_cookie(inode);
         unlock_new_inode(inode);
         return inode;
@@ -1092,7 +1092,7 @@ v9fs_vfs_getattr(const struct path *path, struct kstat *stat,
         if (IS_ERR(st))
                 return PTR_ERR(st);
 
-        v9fs_stat2inode(st, d_inode(dentry), dentry->d_sb);
+        v9fs_stat2inode(st, d_inode(dentry), dentry->d_sb, 0);
         generic_fillattr(d_inode(dentry), stat);
 
         p9stat_free(st);
@@ -1170,12 +1170,13 @@ static int v9fs_vfs_setattr(struct dentry *dentry, struct iattr *iattr)
  * @stat: Plan 9 metadata (mistat) structure
  * @inode: inode to populate
  * @sb: superblock of filesystem
+ * @flags: control flags (e.g. V9FS_STAT2INODE_KEEP_ISIZE)
  *
  */
 
 void
 v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode,
-        struct super_block *sb)
+                 struct super_block *sb, unsigned int flags)
 {
         umode_t mode;
         char ext[32];
@@ -1216,10 +1217,11 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode,
         mode = p9mode2perm(v9ses, stat);
         mode |= inode->i_mode & ~S_IALLUGO;
         inode->i_mode = mode;
-        i_size_write(inode, stat->length);
 
+        if (!(flags & V9FS_STAT2INODE_KEEP_ISIZE))
+                v9fs_i_size_write(inode, stat->length);
         /* not real number of blocks, but 512 byte ones ... */
-        inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9;
+        inode->i_blocks = (stat->length + 512 - 1) >> 9;
         v9inode->cache_validity &= ~V9FS_INO_INVALID_ATTR;
 }
 
@@ -1416,9 +1418,9 @@ int v9fs_refresh_inode(struct p9_fid *fid, struct inode *inode)
 {
         int umode;
         dev_t rdev;
-        loff_t i_size;
         struct p9_wstat *st;
         struct v9fs_session_info *v9ses;
+        unsigned int flags;
 
         v9ses = v9fs_inode2v9ses(inode);
         st = p9_client_stat(fid);
@@ -1431,16 +1433,13 @@ int v9fs_refresh_inode(struct p9_fid *fid, struct inode *inode)
         if ((inode->i_mode & S_IFMT) != (umode & S_IFMT))
                 goto out;
 
-        spin_lock(&inode->i_lock);
         /*
          * We don't want to refresh inode->i_size,
          * because we may have cached data
          */
-        i_size = inode->i_size;
-        v9fs_stat2inode(st, inode, inode->i_sb);
-        if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)
-                inode->i_size = i_size;
-        spin_unlock(&inode->i_lock);
+        flags = (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) ?
+                V9FS_STAT2INODE_KEEP_ISIZE : 0;
+        v9fs_stat2inode(st, inode, inode->i_sb, flags);
 out:
         p9stat_free(st);
         kfree(st);