diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-07-03 03:25:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 18:27:06 -0400 |
commit | a90b9c05df3c1e58eaedc28795d0f5abd896c098 (patch) | |
tree | bc9c1233bad94175abca731daa9120151e0d9c7e /fs | |
parent | 13e83599d282ddfd544600df9db5ab343ac4662f (diff) |
[PATCH] lockdep: annotate dcache
Teach special (recursive) locking code to the lock validator. Has no effect
on non-lockdep kernels.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/dcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index bec4de176c81..1b4a3a34ec57 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
@@ -1339,10 +1339,10 @@ void d_move(struct dentry * dentry, struct dentry * target) | |||
1339 | */ | 1339 | */ |
1340 | if (target < dentry) { | 1340 | if (target < dentry) { |
1341 | spin_lock(&target->d_lock); | 1341 | spin_lock(&target->d_lock); |
1342 | spin_lock(&dentry->d_lock); | 1342 | spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED); |
1343 | } else { | 1343 | } else { |
1344 | spin_lock(&dentry->d_lock); | 1344 | spin_lock(&dentry->d_lock); |
1345 | spin_lock(&target->d_lock); | 1345 | spin_lock_nested(&target->d_lock, DENTRY_D_LOCK_NESTED); |
1346 | } | 1346 | } |
1347 | 1347 | ||
1348 | /* Move the dentry to the target hash queue, if on different bucket */ | 1348 | /* Move the dentry to the target hash queue, if on different bucket */ |