aboutsummaryrefslogtreecommitdiffstats
path: root/fs/namei.c
diff options
context:
space:
mode:
authorNick Piggin <npiggin@kernel.dk>2011-01-07 01:49:38 -0500
committerNick Piggin <npiggin@kernel.dk>2011-01-07 01:50:23 -0500
commitb5c84bf6f6fa3a7dfdcb556023a62953574b60ee (patch)
tree7a2c299a180713e21d5cb653cb933121adf53c31 /fs/namei.c
parent949854d02455080d20cd3e1db28a3a18daf7599d (diff)
fs: dcache remove dcache_lock
dcache_lock no longer protects anything. remove it. Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/namei.c')
-rw-r--r--fs/namei.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/namei.c b/fs/namei.c
index cbfa5fb31072..5642bc2be418 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -612,8 +612,8 @@ int follow_up(struct path *path)
612 return 1; 612 return 1;
613} 613}
614 614
615/* no need for dcache_lock, as serialization is taken care in 615/*
616 * namespace.c 616 * serialization is taken care of in namespace.c
617 */ 617 */
618static int __follow_mount(struct path *path) 618static int __follow_mount(struct path *path)
619{ 619{
@@ -645,9 +645,6 @@ static void follow_mount(struct path *path)
645 } 645 }
646} 646}
647 647
648/* no need for dcache_lock, as serialization is taken care in
649 * namespace.c
650 */
651int follow_down(struct path *path) 648int follow_down(struct path *path)
652{ 649{
653 struct vfsmount *mounted; 650 struct vfsmount *mounted;
@@ -2131,12 +2128,10 @@ void dentry_unhash(struct dentry *dentry)
2131{ 2128{
2132 dget(dentry); 2129 dget(dentry);
2133 shrink_dcache_parent(dentry); 2130 shrink_dcache_parent(dentry);
2134 spin_lock(&dcache_lock);
2135 spin_lock(&dentry->d_lock); 2131 spin_lock(&dentry->d_lock);
2136 if (dentry->d_count == 2) 2132 if (dentry->d_count == 2)
2137 __d_drop(dentry); 2133 __d_drop(dentry);
2138 spin_unlock(&dentry->d_lock); 2134 spin_unlock(&dentry->d_lock);
2139 spin_unlock(&dcache_lock);
2140} 2135}
2141 2136
2142int vfs_rmdir(struct inode *dir, struct dentry *dentry) 2137int vfs_rmdir(struct inode *dir, struct dentry *dentry)