From ffacfa2f1372fec18570577a75afd2f03ecea61f Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Mon, 3 Jul 2006 00:25:21 -0700
Subject: [PATCH] --- yaml --- r: 31832 b: refs/heads/master c:
 8e7795ef6b5fd117b22b87ea7d501de2526a25f7 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/usb/core/inode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 03953053a3dc..6210e4aef7a0 100644
--- 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
index cf11196e012d..f48c3dbc367a 100644
--- 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))