summaryrefslogtreecommitdiffstats
path: root/xlators/nfs/server/src/nfs3.c
diff options
context:
space:
mode:
authorShehjar Tikoo <shehjart@gluster.com>2010-10-21 04:06:49 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-10-21 05:11:23 -0700
commit559055ebfebe8d58c8607c521661c1f1c1d3a2d5 (patch)
tree3b25da288cae6c076dc281a48dff8a061c1cf360 /xlators/nfs/server/src/nfs3.c
parent46b7ce29e1b300044e03841a1a70325f190416c1 (diff)
nfs3: Correctly funge solaris root lookup FH for DVM
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 1997 (Solaris mount fails with "RPC program not registered") URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1997
Diffstat (limited to 'xlators/nfs/server/src/nfs3.c')
-rw-r--r--xlators/nfs/server/src/nfs3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index fe265ed73f8..742c63aa208 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -250,12 +250,12 @@ out:
goto erl; \
} \
\
- if ((gf_nfs_dvm_off (nfs_state (nfs3st->nfsx)))) { \
+ (fhd)->gfid[15] = 1; \
+ (enam) = NULL; \
+ if ((gf_nfs_dvm_off (nfs_state (nfs3st->nfsx)))) \
(fhd)->exportid[15] = nfs_xlator_to_xlid ((nfs3st)->exportslist, fungexl); \
- (fhd)->gfid[15] = 1; \
- (enam) = NULL; \
- } else { \
- if(!__nfs3_get_volume_id ((nfs3st), fungexl, (fhd)->exportid)) { \
+ else { \
+ if(__nfs3_get_volume_id ((nfs3st), fungexl, (fhd)->exportid) < 0) { \
(nfsst) = NFS3ERR_STALE; \
goto erl; \
} \