diff --git a/[refs] b/[refs]
index e5b559b31f34..362f902e0209 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d02a030b01443f1cb81f22750113fe9a98109d9
+refs/heads/master: 7ed94296a660a61989b5d54f0c4bb804f30567d3
diff --git a/trunk/fs/nfsd/nfsproc.c b/trunk/fs/nfsd/nfsproc.c
index 06cd0db0f32b..4e06810b6104 100644
--- a/trunk/fs/nfsd/nfsproc.c
+++ b/trunk/fs/nfsd/nfsproc.c
@@ -225,7 +225,7 @@ nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp,
 	nfserr = nfserr_exist;
 	if (isdotent(argp->name, argp->len))
 		goto done;
-	fh_lock(dirfhp);
+	fh_lock_nested(dirfhp, I_MUTEX_PARENT);
 	dchild = lookup_one_len(argp->name, dirfhp->fh_dentry, argp->len);
 	if (IS_ERR(dchild)) {
 		nfserr = nfserrno(PTR_ERR(dchild));