aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p/vfs_inode.c
diff options
context:
space:
mode:
authorNick Piggin <npiggin@kernel.dk>2011-01-07 01:49:35 -0500
committerNick Piggin <npiggin@kernel.dk>2011-01-07 01:50:22 -0500
commitb23fb0a60379a95e10c671f646b259ea2558421e (patch)
tree7c3644b91241d32fda502a7be0b78e4c225f8091 /fs/9p/vfs_inode.c
parent2fd6b7f50797f2e993eea59e0a0b8c6399c811dc (diff)
fs: scale inode alias list
Add a new lock, dcache_inode_lock, to protect the inode's i_dentry list from concurrent modification. d_alias is also protected by d_lock. Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/9p/vfs_inode.c')
-rw-r--r--fs/9p/vfs_inode.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 34bf71b56542..47dfd5d29a6b 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -271,9 +271,11 @@ static struct dentry *v9fs_dentry_from_dir_inode(struct inode *inode)
271 struct dentry *dentry; 271 struct dentry *dentry;
272 272
273 spin_lock(&dcache_lock); 273 spin_lock(&dcache_lock);
274 spin_lock(&dcache_inode_lock);
274 /* Directory should have only one entry. */ 275 /* Directory should have only one entry. */
275 BUG_ON(S_ISDIR(inode->i_mode) && !list_is_singular(&inode->i_dentry)); 276 BUG_ON(S_ISDIR(inode->i_mode) && !list_is_singular(&inode->i_dentry));
276 dentry = list_entry(inode->i_dentry.next, struct dentry, d_alias); 277 dentry = list_entry(inode->i_dentry.next, struct dentry, d_alias);
278 spin_unlock(&dcache_inode_lock);
277 spin_unlock(&dcache_lock); 279 spin_unlock(&dcache_lock);
278 return dentry; 280 return dentry;
279} 281}