From 559055ebfebe8d58c8607c521661c1f1c1d3a2d5 Mon Sep 17 00:00:00 2001 From: Shehjar Tikoo Date: Thu, 21 Oct 2010 04:06:49 +0000 Subject: nfs3: Correctly funge solaris root lookup FH for DVM Signed-off-by: Shehjar Tikoo Signed-off-by: Anand V. Avati BUG: 1997 (Solaris mount fails with "RPC program not registered") URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1997 --- xlators/nfs/server/src/nfs3.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xlators/nfs/server/src/nfs3.c') 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; \ } \ -- cgit