---

yaml --- r: 31832 b: refs/heads/master c: 8e7795e h: refs/heads/master v: v3
git-mirror · Jul 3, 2006 · ffacfa2 · ffacfa2
1 parent 1d0c2dd
commit ffacfa2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c81a4197de38411fe3e27f8593fff73a5d6b868
+refs/heads/master: 8e7795ef6b5fd117b22b87ea7d501de2526a25f7
diff --git a/trunk/drivers/usb/core/inode.c b/trunk/drivers/usb/core/inode.c
@@ -527,7 +527,7 @@ static void fs_remove_file (struct dentry *dentry)
 	if (!parent || !parent->d_inode)
 		return;
 
-	mutex_lock(&parent->d_inode->i_mutex);
+	mutex_lock_nested(&parent->d_inode->i_mutex, I_MUTEX_PARENT);
 	if (usbfs_positive(dentry)) {
 		if (dentry->d_inode) {
 			if (S_ISDIR(dentry->d_inode->i_mode))