aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ncpfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ncpfs')
-rw-r--r--fs/ncpfs/dir.c3
-rw-r--r--fs/ncpfs/ncplib_kernel.h4
2 files changed, 0 insertions, 7 deletions
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index 102278ed38bd..de15c533311c 100644
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -391,7 +391,6 @@ ncp_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos)
391 } 391 }
392 392
393 /* If a pointer is invalid, we search the dentry. */ 393 /* If a pointer is invalid, we search the dentry. */
394 spin_lock(&dcache_lock);
395 spin_lock(&parent->d_lock); 394 spin_lock(&parent->d_lock);
396 next = parent->d_subdirs.next; 395 next = parent->d_subdirs.next;
397 while (next != &parent->d_subdirs) { 396 while (next != &parent->d_subdirs) {
@@ -402,13 +401,11 @@ ncp_dget_fpos(struct dentry *dentry, struct dentry *parent, unsigned long fpos)
402 else 401 else
403 dent = NULL; 402 dent = NULL;
404 spin_unlock(&parent->d_lock); 403 spin_unlock(&parent->d_lock);
405 spin_unlock(&dcache_lock);
406 goto out; 404 goto out;
407 } 405 }
408 next = next->next; 406 next = next->next;
409 } 407 }
410 spin_unlock(&parent->d_lock); 408 spin_unlock(&parent->d_lock);
411 spin_unlock(&dcache_lock);
412 return NULL; 409 return NULL;
413 410
414out: 411out:
diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h
index c4b718ff9a6b..1220df75ff22 100644
--- a/fs/ncpfs/ncplib_kernel.h
+++ b/fs/ncpfs/ncplib_kernel.h
@@ -193,7 +193,6 @@ ncp_renew_dentries(struct dentry *parent)
193 struct list_head *next; 193 struct list_head *next;
194 struct dentry *dentry; 194 struct dentry *dentry;
195 195
196 spin_lock(&dcache_lock);
197 spin_lock(&parent->d_lock); 196 spin_lock(&parent->d_lock);
198 next = parent->d_subdirs.next; 197 next = parent->d_subdirs.next;
199 while (next != &parent->d_subdirs) { 198 while (next != &parent->d_subdirs) {
@@ -207,7 +206,6 @@ ncp_renew_dentries(struct dentry *parent)
207 next = next->next; 206 next = next->next;
208 } 207 }
209 spin_unlock(&parent->d_lock); 208 spin_unlock(&parent->d_lock);
210 spin_unlock(&dcache_lock);
211} 209}
212 210
213static inline void 211static inline void
@@ -217,7 +215,6 @@ ncp_invalidate_dircache_entries(struct dentry *parent)
217 struct list_head *next; 215 struct list_head *next;
218 struct dentry *dentry; 216 struct dentry *dentry;
219 217
220 spin_lock(&dcache_lock);
221 spin_lock(&parent->d_lock); 218 spin_lock(&parent->d_lock);
222 next = parent->d_subdirs.next; 219 next = parent->d_subdirs.next;
223 while (next != &parent->d_subdirs) { 220 while (next != &parent->d_subdirs) {
@@ -227,7 +224,6 @@ ncp_invalidate_dircache_entries(struct dentry *parent)
227 next = next->next; 224 next = next->next;
228 } 225 }
229 spin_unlock(&parent->d_lock); 226 spin_unlock(&parent->d_lock);
230 spin_unlock(&dcache_lock);
231} 227}
232 228
233struct ncp_cache_head { 229struct ncp_cache_head {