From 720eb5e0369851010f9a88f5d2e115994ac77617 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 27 Aug 2007 11:33:00 -0400
Subject: [PATCH] --- yaml --- r: 64699 b: refs/heads/master c:
 deee9369b993b52a8e2f25683b4a67be7a65e8ae h: refs/heads/master i:   64697:
 1d1663a0c14758219f13af102525c28d1a310c4b   64695:
 8f90c7b3b3370b865183320a66fc87439945af9e v: v3

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

diff --git a/[refs] b/[refs]
index c5d3791f8ae4..34fcc2d59307 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65bbf6bdbba0f74e254f706bfb00fe533974f4f1
+refs/heads/master: deee9369b993b52a8e2f25683b4a67be7a65e8ae
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index 036d8625b4f9..4b90e17555a9 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -1434,7 +1434,7 @@ nfs4_atomic_open(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
 	}
 	res = d_add_unique(dentry, igrab(state->inode));
 	if (res != NULL)
-		dentry = res;
+		path.dentry = res;
 	nfs4_intent_set_file(nd, &path, state);
 	return res;
 }