Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] lockdep: annotate i_mutex

Browse Source 
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>
This commit is contained in:
Ingo Molnar 2006-07-03 00:25:05 -07:00 committed by Linus Torvalds
parent a90b9c05df
commit f2eace23e9
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/core/inode.c
View File

@ -200,7 +200,7 @@ static void update_sb(struct super_block *sb)
if (!root) if (!root)
return; return;
mutex_lock(&root->d_inode->i_mutex); mutex_lock_nested(&root->d_inode->i_mutex, I_MUTEX_PARENT);
list_for_each_entry(bus, &root->d_subdirs, d_u.d_child) { list_for_each_entry(bus, &root->d_subdirs, d_u.d_child) {
if (bus->d_inode) { if (bus->d_inode) {

20
fs/namei.c
View File

@ -1423,7 +1423,7 @@ struct dentry *lock_rename(struct dentry *p1, struct dentry *p2)
struct dentry *p; struct dentry *p;
if (p1 == p2) { if (p1 == p2) {
mutex_lock(&p1->d_inode->i_mutex); mutex_lock_nested(&p1->d_inode->i_mutex, I_MUTEX_PARENT);
return NULL; return NULL;
} }
@ -1431,22 +1431,22 @@ struct dentry *lock_rename(struct dentry *p1, struct dentry *p2)
for (p = p1; p->d_parent != p; p = p->d_parent) { for (p = p1; p->d_parent != p; p = p->d_parent) {
if (p->d_parent == p2) { if (p->d_parent == p2) {
mutex_lock(&p2->d_inode->i_mutex); mutex_lock_nested(&p2->d_inode->i_mutex, I_MUTEX_PARENT);
mutex_lock(&p1->d_inode->i_mutex); mutex_lock_nested(&p1->d_inode->i_mutex, I_MUTEX_CHILD);
return p; return p;
} }
} }
for (p = p2; p->d_parent != p; p = p->d_parent) { for (p = p2; p->d_parent != p; p = p->d_parent) {
if (p->d_parent == p1) { if (p->d_parent == p1) {
mutex_lock(&p1->d_inode->i_mutex); mutex_lock_nested(&p1->d_inode->i_mutex, I_MUTEX_PARENT);
mutex_lock(&p2->d_inode->i_mutex); mutex_lock_nested(&p2->d_inode->i_mutex, I_MUTEX_CHILD);
return p; return p;
} }
} }
mutex_lock(&p1->d_inode->i_mutex); mutex_lock_nested(&p1->d_inode->i_mutex, I_MUTEX_PARENT);
mutex_lock(&p2->d_inode->i_mutex); mutex_lock_nested(&p2->d_inode->i_mutex, I_MUTEX_CHILD);
return NULL; return NULL;
} }
@ -1751,7 +1751,7 @@ struct dentry *lookup_create(struct nameidata *nd, int is_dir)
{ {
struct dentry *dentry = ERR_PTR(-EEXIST); struct dentry *dentry = ERR_PTR(-EEXIST);
mutex_lock(&nd->dentry->d_inode->i_mutex); mutex_lock_nested(&nd->dentry->d_inode->i_mutex, I_MUTEX_PARENT);
/* /*
* Yucky last component or no last component at all? * Yucky last component or no last component at all?
* (foo/., foo/.., /////) * (foo/., foo/.., /////)
@ -2008,7 +2008,7 @@ static long do_rmdir(int dfd, const char __user *pathname)
error = -EBUSY; error = -EBUSY;
goto exit1; goto exit1;
} }
mutex_lock(&nd.dentry->d_inode->i_mutex); mutex_lock_nested(&nd.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
dentry = lookup_hash(&nd); dentry = lookup_hash(&nd);
error = PTR_ERR(dentry); error = PTR_ERR(dentry);
if (!IS_ERR(dentry)) { if (!IS_ERR(dentry)) {
@ -2082,7 +2082,7 @@ static long do_unlinkat(int dfd, const char __user *pathname)
error = -EISDIR; error = -EISDIR;
if (nd.last_type != LAST_NORM) if (nd.last_type != LAST_NORM)
goto exit1; goto exit1;
mutex_lock(&nd.dentry->d_inode->i_mutex); mutex_lock_nested(&nd.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
dentry = lookup_hash(&nd); dentry = lookup_hash(&nd);
error = PTR_ERR(dentry); error = PTR_ERR(dentry);
if (!IS_ERR(dentry)) { if (!IS_ERR(dentry)) {

19
include/linux/fs.h
View File

@ -542,6 +542,25 @@ struct inode {
#endif #endif
}; };
/*
* inode->i_mutex nesting subclasses for the lock validator:
*
* 0: the object of the current VFS operation
* 1: parent
* 2: child/target
* 3: quota file
*
* The locking order between these classes is
* parent -> child -> normal -> quota
*/
enum inode_i_mutex_lock_class
{
I_MUTEX_NORMAL,
I_MUTEX_PARENT,
I_MUTEX_CHILD,
I_MUTEX_QUOTA
};
/* /*
* NOTE: in a 32bit arch with a preemptable kernel and * NOTE: in a 32bit arch with a preemptable kernel and
* an UP compile the i_size_read/write must be atomic * an UP compile the i_size_read/write must be atomic