summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorRajesh Amaravathi <rajesh@redhat.com>2012-04-13 14:19:11 +0530
committerVijay Bellur <vijay@gluster.com>2012-04-16 11:19:01 -0700
commitc6e226751efb4ce98e5c887b955c778b713b77bc (patch)
tree5661514d10914cdf6443835d819f2880c4c5ec40 /xlators
parentdc4c44d51e3eb4b53e78840bf223911e48ce62b5 (diff)
nfs/server: hard resolve fh on restart
the filehandle passed to hard resolving code was not initialized to it correct value (resovlefh). Change-Id: I0a26c7b90bf3efec7fda26fed0823755c4b9e87b BUG: 802779 Signed-off-by: Rajesh Amaravathi <rajesh@redhat.com> Reviewed-on: http://review.gluster.com/3150 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/nfs/server/src/nfs3.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index 75375f3..a155b4e 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -1357,6 +1357,8 @@ nfs3_lookup_resume (void *carg)
cs = (nfs3_call_state_t *)carg;
nfs3_check_fh_resolve_status (cs, stat, nfs3err);
+ cs->parent = cs->resolvefh;
+
if (cs->hardresolved) {
stat = NFS3_OK;
nfs3_fh_build_child_fh (&cs->parent, &cs->stbuf, &newfh);
@@ -1364,7 +1366,6 @@ nfs3_lookup_resume (void *carg)
}
nfs_request_user_init (&nfu, cs->req);
- cs->parent = cs->resolvefh;
ret = nfs_lookup (cs->nfsx, cs->vol, &nfu, &cs->resolvedloc,
nfs3svc_lookup_cbk, cs);
if (ret < 0)