1 files changed, 5 insertions, 4 deletions

diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 8a3b6a1a6ad1..c398861f78a5 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -93,8 +93,8 @@ static struct configfs_dirent *configfs_new_dirent(struct configfs_dirent * pare
  *
  * called with parent inode's i_mutex held
  */
-int configfs_dirent_exists(struct configfs_dirent *parent_sd,
-                           const unsigned char *new)
+static int configfs_dirent_exists(struct configfs_dirent *parent_sd,
+                                  const unsigned char *new)
 {
         struct configfs_dirent * sd;
 
@@ -1176,8 +1176,9 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys)
                 return;
         }
 
-        mutex_lock(&configfs_sb->s_root->d_inode->i_mutex);
-        mutex_lock(&dentry->d_inode->i_mutex);
+        mutex_lock_nested(&configfs_sb->s_root->d_inode->i_mutex,
+                          I_MUTEX_PARENT);
+        mutex_lock_nested(&dentry->d_inode->i_mutex, I_MUTEX_CHILD);
         if (configfs_detach_prep(dentry)) {
                 printk(KERN_ERR "configfs: Tried to unregister non-empty subsystem!\n");
         }