---

yaml --- r: 43749 b: refs/heads/master c: 4b75f78 h: refs/heads/master i: 43747: cbceb78 v: v3
git-mirror · Dec 8, 2006 · d8e49ae · d8e49ae
1 parent 08b97e4
commit d8e49ae
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: df61bec3ae8983984070db24ae481fe7297a6dff
+refs/heads/master: 4b75f78edcab291eb29fe9a205cbf7b80c1c644f
diff --git a/trunk/fs/nfsd/nfs4recover.c b/trunk/fs/nfsd/nfs4recover.c
@@ -259,7 +259,7 @@ nfsd4_remove_clid_file(struct dentry *dir, struct dentry *dentry)
 		printk("nfsd4: non-file found in client recovery directory\n");
 		return -EINVAL;
 	}
-	mutex_lock(&dir->d_inode->i_mutex);
+	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
 	status = vfs_unlink(dir->d_inode, dentry);
 	mutex_unlock(&dir->d_inode->i_mutex);
 	return status;