From: Andrew Morton <akpm@osdl.org>

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/dcache.c |    5 +++++
 1 file changed, 5 insertions(+)

diff -puN fs/dcache.c~lock-validator-special-locking-sb-s_umount-fix fs/dcache.c
--- devel/fs/dcache.c~lock-validator-special-locking-sb-s_umount-fix	2006-05-29 18:13:30.000000000 -0700
+++ devel-akpm/fs/dcache.c	2006-05-29 18:13:30.000000000 -0700
@@ -470,9 +470,14 @@ static void prune_dcache(int count, stru
 		s_umount = &dentry->d_sb->s_umount;
 		if (down_read_trylock(s_umount)) {
 			if (dentry->d_sb->s_root != NULL) {
+#ifdef CONFIG_LOCKDEP
 // lockdep hack: do this better!
 				up_read(s_umount);
 				prune_one_dentry(dentry);
+#else
+				prune_one_dentry(dentry);
+				up_read(s_umount);
+#endif
 				continue;
 			}
 			up_read(s_umount);
_