andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfs: use hostname without port numbers

Browse Source 
Change-Id: I7c4cba84723a9ca73f1d1f1e9a2c479a2bfd14fe
BUG: 798969
Signed-off-by: Krishna Srinivas <ksriniva@redhat.com>
Reviewed-on: http://review.gluster.com/2973
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
This commit is contained in:
Krishna Srinivas 2012-03-13 20:49:35 +05:30 committed by Vijay Bellur
parent 8b6534031a
commit c3a16c32f5
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
xlators/nfs/server/src/mount3.c
View File

@ -192,6 +192,7 @@ mnt3svc_update_mountlist (struct mount3_state *ms, rpcsvc_request_t *req,
{ {
struct mountentry *me = NULL; struct mountentry *me = NULL;
int ret = -1; int ret = -1;
char *colon = NULL;
if ((!ms) || (!req) || (!expname)) if ((!ms) || (!req) || (!expname))
return -1; return -1;
@ -210,6 +211,10 @@ mnt3svc_update_mountlist (struct mount3_state *ms, rpcsvc_request_t *req,
if (ret == -1) if (ret == -1)
goto free_err; goto free_err;
colon = strrchr (me->hostname, ':');
if (colon) {
*colon = '\0';
}
LOCK (&ms->mountlock); LOCK (&ms->mountlock);
{ {
list_add_tail (&me->mlist, &ms->mountlist); list_add_tail (&me->mlist, &ms->mountlist);
@ -1163,6 +1168,7 @@ mnt3svc_umnt (rpcsvc_request_t *req)
int ret = -1; int ret = -1;
struct mount3_state *ms = NULL; struct mount3_state *ms = NULL;
mountstat3 mstat = MNT3_OK; mountstat3 mstat = MNT3_OK;
char *colon = NULL;
if (!req) if (!req)
return -1; return -1;
@ -1189,37 +1195,23 @@ mnt3svc_umnt (rpcsvc_request_t *req)
if (ret != 0) { if (ret != 0) {
gf_log (GF_MNT, GF_LOG_ERROR, "Failed to get remote name: %s", gf_log (GF_MNT, GF_LOG_ERROR, "Failed to get remote name: %s",
gai_strerror (ret)); gai_strerror (ret));
goto try_umount_with_addr;
}
gf_log (GF_MNT, GF_LOG_DEBUG, "dirpath: %s, hostname: %s", dirpath,
hostname);
ret = mnt3svc_umount (ms, dirpath, hostname);
/* Unmount succeeded with the given hostname. */
if (ret == 0)
goto snd_reply;
try_umount_with_addr:
if (ret != 0)
ret = rpcsvc_transport_peeraddr (req->trans, hostname,
MNTPATHLEN, NULL, 0);
if (ret != 0) {
gf_log (GF_MNT, GF_LOG_ERROR, "Failed to get remote addr: %s",
gai_strerror (ret));
rpcsvc_request_seterr (req, SYSTEM_ERR);
goto rpcerr; goto rpcerr;
} }
colon = strrchr (hostname, ':');
if (colon) {
*colon= '\0';
}
gf_log (GF_MNT, GF_LOG_DEBUG, "dirpath: %s, hostname: %s", dirpath, gf_log (GF_MNT, GF_LOG_DEBUG, "dirpath: %s, hostname: %s", dirpath,
hostname); hostname);
ret = mnt3svc_umount (ms, dirpath, hostname); ret = mnt3svc_umount (ms, dirpath, hostname);
if (ret == -1)
mstat = MNT3ERR_INVAL;
ret = 0; if (ret == -1) {
snd_reply: mstat = MNT3ERR_NOENT;
}
/* FIXME: also take care of the corner case where the
* client was resolvable at mount but not at the umount - vice-versa.
*/
mnt3svc_submit_reply (req, &mstat, mnt3svc_submit_reply (req, &mstat,
(mnt3_serializer)xdr_serialize_mountstat3); (mnt3_serializer)xdr_serialize_mountstat3);