summaryrefslogtreecommitdiffstats
path: root/xlators/nfs/server/src
diff options
context:
space:
mode:
authorRichard Wareing <rwareing@fb.com>2015-09-29 15:35:08 -0700
committerShreyas Siravara <sshreyas@fb.com>2017-08-29 22:32:43 +0000
commit24932f2fd323deb4acab4e0c29601d5ca955f602 (patch)
tree1286d069dcec24aab15186ccd89b7ec8ca8dc9c3 /xlators/nfs/server/src
parent8c50512d129b11778e2fd88c8976a527515546d7 (diff)
cluster/afr: SHD should not use did_discovery code paths
Summary: - Exempt the SHD from the discover code path Test Plan: - prove -v tests/bugs/fb8149516.t - Make rc and canary on offending host (gfsdataswarm048.prn2) Reviewers: moox, dph, sshreyas Reviewed By: sshreyas Differential Revision: https://phabricator.fb.com/D2491694 Change-Id: I5ec3997cf26375e834c3c7c4ea6c174eef957b8b Signed-off-by: Jeff Darcy <jdarcy@fb.com> Reviewed-on: https://review.gluster.org/18141 Tested-by: Jeff Darcy <jeff@pl.atyp.us> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Shreyas Siravara <sshreyas@fb.com>
Diffstat (limited to 'xlators/nfs/server/src')
-rw-r--r--xlators/nfs/server/src/mount3.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index 0a3d79af6f0..525c83c150f 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -1193,6 +1193,9 @@ mnt3_resolve_subdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
/* Build mountid from the authorized path and stick it in the
* filehandle that will get passed back to the client
*/
+ if (!authorized_path) {
+ goto err;
+ }
__mnt3_build_mountid_from_path (authorized_path, fh.mountid);
snprintf (path, PATH_MAX, "/%s%s", mres->exp->vol->name,