aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2011-02-28 06:34:09 -0500
committerEric Van Hensbergen <ericvh@gmail.com>2011-03-15 10:57:42 -0400
commitc06c066a083aa0a336d6b2b1ed502dd0b8488ac7 (patch)
tree6bd0578a96b49e8c2b8aff619d2176e505161f25
parente0459f57b8b3bbabf6f11f73da4d17abb0c159de (diff)
fs/9p: Properly update inode attributes on link
With caching enabled, we need to make sure we don't update inode->i_size via stat2inode because we could have dirty data which is not yet written to the server Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
-rw-r--r--fs/9p/vfs_inode.c4
-rw-r--r--fs/9p/vfs_inode_dotl.c10
2 files changed, 4 insertions, 10 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 8e9d60345bc8..524d255a5748 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -1292,8 +1292,10 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir,
1292 sprintf(name, "%d\n", oldfid->fid); 1292 sprintf(name, "%d\n", oldfid->fid);
1293 retval = v9fs_vfs_mkspecial(dir, dentry, P9_DMLINK, name); 1293 retval = v9fs_vfs_mkspecial(dir, dentry, P9_DMLINK, name);
1294 __putname(name); 1294 __putname(name);
1295 if (!retval) 1295 if (!retval) {
1296 v9fs_refresh_inode(oldfid, old_dentry->d_inode);
1296 v9fs_invalidate_inode_attr(dir); 1297 v9fs_invalidate_inode_attr(dir);
1298 }
1297clunk_fid: 1299clunk_fid:
1298 p9_client_clunk(oldfid); 1300 p9_client_clunk(oldfid);
1299 return retval; 1301 return retval;
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 4d4c70e07081..81bb4c2a0b82 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -671,19 +671,11 @@ v9fs_vfs_link_dotl(struct dentry *old_dentry, struct inode *dir,
671 if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) { 671 if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
672 /* Get the latest stat info from server. */ 672 /* Get the latest stat info from server. */
673 struct p9_fid *fid; 673 struct p9_fid *fid;
674 struct p9_stat_dotl *st;
675
676 fid = v9fs_fid_lookup(old_dentry); 674 fid = v9fs_fid_lookup(old_dentry);
677 if (IS_ERR(fid)) 675 if (IS_ERR(fid))
678 return PTR_ERR(fid); 676 return PTR_ERR(fid);
679 677
680 st = p9_client_getattr_dotl(fid, P9_STATS_BASIC); 678 v9fs_refresh_inode_dotl(fid, old_dentry->d_inode);
681 if (IS_ERR(st))
682 return PTR_ERR(st);
683
684 v9fs_stat2inode_dotl(st, old_dentry->d_inode);
685
686 kfree(st);
687 } 679 }
688 ihold(old_dentry->d_inode); 680 ihold(old_dentry->d_inode);
689 d_instantiate(dentry, old_dentry->d_inode); 681 d_instantiate(dentry, old_dentry->d_inode);