aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p/vfs_inode.c
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2011-03-08 06:09:46 -0500
committerEric Van Hensbergen <ericvh@gmail.com>2011-03-22 16:43:35 -0400
commit5a7e0a8cf50cf905403f5a498e86d1f97cfcf51b (patch)
tree3f20f98db76f7a221f397630a03e6089c1208510 /fs/9p/vfs_inode.c
parentf741a79e982cf56d7584435bad663553ffe6715f (diff)
fs/9p: Fix race in initializing writeback fid
When two process open the same file we can end up with both of them allocating the writeback_fid. Add a new mutex which can be used for synchronizing v9fs_inode member values. 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>
Diffstat (limited to 'fs/9p/vfs_inode.c')
-rw-r--r--fs/9p/vfs_inode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 8a2c232f708a..c6cef2495f00 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -221,6 +221,7 @@ struct inode *v9fs_alloc_inode(struct super_block *sb)
221#endif 221#endif
222 v9inode->writeback_fid = NULL; 222 v9inode->writeback_fid = NULL;
223 v9inode->cache_validity = 0; 223 v9inode->cache_validity = 0;
224 mutex_init(&v9inode->v_mutex);
224 return &v9inode->vfs_inode; 225 return &v9inode->vfs_inode;
225} 226}
226 227
@@ -650,6 +651,7 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode,
650 /* if we are opening a file, assign the open fid to the file */ 651 /* if we are opening a file, assign the open fid to the file */
651 if (nd && nd->flags & LOOKUP_OPEN) { 652 if (nd && nd->flags & LOOKUP_OPEN) {
652 v9inode = V9FS_I(dentry->d_inode); 653 v9inode = V9FS_I(dentry->d_inode);
654 mutex_lock(&v9inode->v_mutex);
653 if (v9ses->cache && !v9inode->writeback_fid) { 655 if (v9ses->cache && !v9inode->writeback_fid) {
654 /* 656 /*
655 * clone a fid and add it to writeback_fid 657 * clone a fid and add it to writeback_fid
@@ -661,10 +663,12 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode,
661 inode_fid = v9fs_writeback_fid(dentry); 663 inode_fid = v9fs_writeback_fid(dentry);
662 if (IS_ERR(inode_fid)) { 664 if (IS_ERR(inode_fid)) {
663 err = PTR_ERR(inode_fid); 665 err = PTR_ERR(inode_fid);
666 mutex_unlock(&v9inode->v_mutex);
664 goto error; 667 goto error;
665 } 668 }
666 v9inode->writeback_fid = (void *) inode_fid; 669 v9inode->writeback_fid = (void *) inode_fid;
667 } 670 }
671 mutex_unlock(&v9inode->v_mutex);
668 filp = lookup_instantiate_filp(nd, dentry, generic_file_open); 672 filp = lookup_instantiate_filp(nd, dentry, generic_file_open);
669 if (IS_ERR(filp)) { 673 if (IS_ERR(filp)) {
670 err = PTR_ERR(filp); 674 err = PTR_ERR(filp);