summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantosh Kumar Pradhan <spradhan@redhat.com>2013-10-13 20:42:57 +0530
committerAnand Avati <avati@redhat.com>2013-10-14 10:20:41 -0700
commit1ce54da9679c53d9e7af787a255ec0ad11aa1ac0 (patch)
tree9400055efde5c3fea998f2c0ce63b9284897596e
parentb7f894fd0e46bcffca534265b95a4171ea59be4e (diff)
nfs/mount3: fix crash in subdir resolution
* __mnt3_resolve_export_subdir_comp: if nfs_entry_loc_fill fails, mres->resolveloc does not contain valid data * gf_log should use 'gfid' instead of mres->resolveloc.inode->gfid * fixes a crash if program flow gets to this line Backport FIX link: http://review.gluster.org/4948 Signed-off-by: Santosh Kumar Pradhan <spradhan@redhat.com> Change-Id: I6dea17ae3f07210430a0b71bd08be6f59f739c9a BUG: 1018547 Signed-off-by: Santosh Kumar Pradhan <spradhan@redhat.com> Reviewed-on: http://review.gluster.org/6083 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
-rw-r--r--xlators/nfs/server/src/mount3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index 255310f..932dccd 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -526,7 +526,7 @@ __mnt3_resolve_export_subdir_comp (mnt3_resolve_t *mres)
if ((ret < 0) && (ret != -2)) {
gf_log (GF_MNT, GF_LOG_ERROR, "Failed to resolve and create "
"inode: parent gfid %s, entry %s",
- uuid_utoa (mres->resolveloc.inode->gfid), nextcomp);
+ uuid_utoa (gfid), nextcomp);
ret = -EFAULT;
goto err;
}