aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/cell/spufs/inode.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 /arch/powerpc/platforms/cell/spufs/inode.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 'arch/powerpc/platforms/cell/spufs/inode.c')
-rw-r--r--arch/powerpc/platforms/cell/spufs/inode.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 5aef1a7f5e4b..2662b50ea8d4 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -159,21 +159,18 @@ static void spufs_prune_dir(struct dentry *dir)
159 159
160 mutex_lock(&dir->d_inode->i_mutex); 160 mutex_lock(&dir->d_inode->i_mutex);
161 list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_u.d_child) { 161 list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_u.d_child) {
162 spin_lock(&dcache_lock);
163 spin_lock(&dentry->d_lock); 162 spin_lock(&dentry->d_lock);
164 if (!(d_unhashed(dentry)) && dentry->d_inode) { 163 if (!(d_unhashed(dentry)) && dentry->d_inode) {
165 dget_locked_dlock(dentry); 164 dget_locked_dlock(dentry);
166 __d_drop(dentry); 165 __d_drop(dentry);
167 spin_unlock(&dentry->d_lock); 166 spin_unlock(&dentry->d_lock);
168 simple_unlink(dir->d_inode, dentry); 167 simple_unlink(dir->d_inode, dentry);
169 /* XXX: what is dcache_lock protecting here? Other 168 /* XXX: what was dcache_lock protecting here? Other
170 * filesystems (IB, configfs) release dcache_lock 169 * filesystems (IB, configfs) release dcache_lock
171 * before unlink */ 170 * before unlink */
172 spin_unlock(&dcache_lock);
173 dput(dentry); 171 dput(dentry);
174 } else { 172 } else {
175 spin_unlock(&dentry->d_lock); 173 spin_unlock(&dentry->d_lock);
176 spin_unlock(&dcache_lock);
177 } 174 }
178 } 175 }
179 shrink_dcache_parent(dir); 176 shrink_dcache_parent(dir);