1 files changed, 14 insertions, 13 deletions

diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 4823e1c46999..a950a927a626 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -143,7 +143,7 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb,
         if (retval)
                 goto error;
 
-        v9fs_stat2inode_dotl(st, inode);
+        v9fs_stat2inode_dotl(st, inode, 0);
         v9fs_cache_inode_get_cookie(inode);
         retval = v9fs_get_acl(inode, fid);
         if (retval)
@@ -496,7 +496,7 @@ v9fs_vfs_getattr_dotl(const struct path *path, struct kstat *stat,
         if (IS_ERR(st))
                 return PTR_ERR(st);
 
-        v9fs_stat2inode_dotl(st, d_inode(dentry));
+        v9fs_stat2inode_dotl(st, d_inode(dentry), 0);
         generic_fillattr(d_inode(dentry), stat);
         /* Change block size to what the server returned */
         stat->blksize = st->st_blksize;
@@ -607,11 +607,13 @@ int v9fs_vfs_setattr_dotl(struct dentry *dentry, struct iattr *iattr)
  * v9fs_stat2inode_dotl - populate an inode structure with stat info
  * @stat: stat structure
  * @inode: inode to populate
+ * @flags: ctrl flags (e.g. V9FS_STAT2INODE_KEEP_ISIZE)
  *
  */
 
 void
-v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode)
+v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode,
+                      unsigned int flags)
 {
         umode_t mode;
         struct v9fs_inode *v9inode = V9FS_I(inode);
@@ -631,7 +633,8 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode)
                 mode |= inode->i_mode & ~S_IALLUGO;
                 inode->i_mode = mode;
 
-                i_size_write(inode, stat->st_size);
+                if (!(flags & V9FS_STAT2INODE_KEEP_ISIZE))
+                        v9fs_i_size_write(inode, stat->st_size);
                 inode->i_blocks = stat->st_blocks;
         } else {
                 if (stat->st_result_mask & P9_STATS_ATIME) {
@@ -661,8 +664,9 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode)
                 }
                 if (stat->st_result_mask & P9_STATS_RDEV)
                         inode->i_rdev = new_decode_dev(stat->st_rdev);
-                if (stat->st_result_mask & P9_STATS_SIZE)
-                        i_size_write(inode, stat->st_size);
+                if (!(flags & V9FS_STAT2INODE_KEEP_ISIZE) &&
+                    stat->st_result_mask & P9_STATS_SIZE)
+                        v9fs_i_size_write(inode, stat->st_size);
                 if (stat->st_result_mask & P9_STATS_BLOCKS)
                         inode->i_blocks = stat->st_blocks;
         }
@@ -928,9 +932,9 @@ v9fs_vfs_get_link_dotl(struct dentry *dentry,
 
 int v9fs_refresh_inode_dotl(struct p9_fid *fid, struct inode *inode)
 {
-        loff_t i_size;
         struct p9_stat_dotl *st;
         struct v9fs_session_info *v9ses;
+        unsigned int flags;
 
         v9ses = v9fs_inode2v9ses(inode);
         st = p9_client_getattr_dotl(fid, P9_STATS_ALL);
@@ -942,16 +946,13 @@ int v9fs_refresh_inode_dotl(struct p9_fid *fid, struct inode *inode)
         if ((inode->i_mode & S_IFMT) != (st->st_mode & 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_dotl(st, inode);
-        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_dotl(st, inode, flags);
 out:
         kfree(st);
         return 0;