Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a90b9c05 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate dcache 



Teach special (recursive) locking code to the lock validator.  Has no effect
on non-lockdep kernels.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 13e83599

fs/dcache.c

+2 −2
Original line number Diff line number Diff line
@@ -1339,10 +1339,10 @@ void d_move(struct dentry * dentry, struct dentry * target) 
	 */

	if (target < dentry) {

		spin_lock(&target->d_lock);

		spin_lock(&dentry->d_lock);

		spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);

	} else {

		spin_lock(&dentry->d_lock);

		spin_lock(&target->d_lock);

		spin_lock_nested(&target->d_lock, DENTRY_D_LOCK_NESTED);

	}



	/* Move the dentry to the target hash queue, if on different bucket */

include/linux/dcache.h

+12 −0
Original line number Diff line number Diff line
@@ -114,6 +114,18 @@ struct dentry { 
	unsigned char d_iname[DNAME_INLINE_LEN_MIN];	/* small names */

};



/*

 * dentry->d_lock spinlock nesting subclasses:

 *

 * 0: normal

 * 1: nested

 */

enum dentry_d_lock_class

{

	DENTRY_D_LOCK_NORMAL, /* implicitly used by plain spin_lock() APIs. */

	DENTRY_D_LOCK_NESTED

};



struct dentry_operations {

	int (*d_revalidate)(struct dentry *, struct nameidata *);

	int (*d_hash) (struct dentry *, struct qstr *);