summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-08-27 11:33:00 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-09-01 10:14:38 -0400
commitdeee9369b993b52a8e2f25683b4a67be7a65e8ae (patch)
treed5d4f56c77ac21bc4f693ceaacdd3b6c87a00e56 /fs/nfs
parent65bbf6bdbba0f74e254f706bfb00fe533974f4f1 (diff)
downloadop-kernel-dev-deee9369b993b52a8e2f25683b4a67be7a65e8ae.zip
op-kernel-dev-deee9369b993b52a8e2f25683b4a67be7a65e8ae.tar.gz
NFSv4: Ensure that we pass the correct dentry to nfs4_intent_set_file
This patch fixes an Oops that was reported by Gabriel Barazer. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 036d862..4b90e17 100644
--- a/fs/nfs/nfs4proc.c
+++ b/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;
}
OpenPOWER on IntegriCloud