Patchwork [BUG:1997,2/2] nfs3: Correctly funge solaris root lookup FH for DVM

login
register
Submitter Shehjar Tikoo
Date 2010-10-21 09:36:49
Message ID <1287653809-20522-2-git-send-email-shehjart@gluster.com>
Download mbox | patch
Permalink /patch/5547/
State Accepted
Headers show

Comments

Shehjar Tikoo - 2010-10-21 09:36:49
From: Shehjar Tikoo <shehjart@gluster.com>


Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
---
 xlators/nfs/server/src/nfs3.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index fe265ed..742c63a 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;                               \
                         }                                               \