From d8e49ae2f57a8694c8b77f04453884cc0f8c4abe Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 8 Dec 2006 02:39:38 -0800
Subject: [PATCH] --- yaml --- r: 43749 b: refs/heads/master c:
 4b75f78edcab291eb29fe9a205cbf7b80c1c644f h: refs/heads/master i:   43747:
 cbceb78308c3605421863e504232d750e62393a1 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/nfsd/nfs4recover.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b721a828beb3..a8993104798d 100644
--- 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
index 81b8565d3837..c7774e3a9469 100644
--- 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;