Revert "Make sure glusterd and glusterfsd use the same address family"

This reverts commit 1dade36a6dfc6cae5559d5139f6b733e1b6fded1

This commit breaks glusterd. The insertion of --xlator-option=<transport family> in between --brick-port and <port> fails command line validation during glusterfsd start.

Change-Id: I40186ca89d1d16cf798404747771353b1f1a3e1d
Reviewed-on: http://review.gluster.com/251
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@gluster.com>

1 files changed, 0 insertions, 52 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index b3d2946d7f5..1cdb0faa49a 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -91,50 +91,6 @@ glusterd_unset_lock_owner (uuid_t owner)
         return 0;
 }
 
-static const char *
-glusterd_listener_family_name(void)
-{
-	xlator_t	 	*this = NULL;
-	glusterd_conf_t		*conf = NULL;
-	rpcsvc_listener_t	*listener = NULL;
-	struct sockaddr_storage ss;
-
-	this = THIS;
-	GF_ASSERT (this);
-	conf = this->private;
-	GF_ASSERT (conf);   
-	GF_ASSERT (conf->rpc);
-	
-	list_for_each_entry (listener, &conf->rpc->listeners, list)
-		break; /* grab first one */
-
-	GF_ASSERT (listener->trans);
-
-	if (rpc_transport_get_myaddr(listener->trans, NULL, 0, 
-				     &ss, sizeof(ss)) != 0) {
-		gf_log ("glusterd", GF_LOG_ERROR,
-			"rpc_transport_get_myname failed: %s",
-			strerror(errno));
-		return NULL;
-	}
-
-	switch (ss.ss_family) {
-		case AF_INET:
-			return "inet";
-			break;
-		case AF_INET6:
-			return "inet6";
-			break;
-		default:
-			gf_log ("glusterd", GF_LOG_ERROR,
-				"unknown address family %d",
-				ss.ss_family);
-			break;
-	}
-	       
-	return NULL;
-}
-
 gf_boolean_t
 glusterd_is_loopback_localhost (const struct sockaddr *sa, char *hostname)
 {
@@ -1073,7 +1029,6 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t  *volinfo,
         FILE                    *file = NULL;
         gf_boolean_t            is_locked = _gf_false;
         char                    socketpath[PATH_MAX] = {0};
-        const char             *family_name;
 
         GF_ASSERT (volinfo);
         GF_ASSERT (brickinfo);
@@ -1161,13 +1116,6 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t  *volinfo,
                          "--brick-name", brickinfo->path,
                          "-l", brickinfo->logfile, "--brick-port",  NULL);
 
-        if ((family_name = glusterd_listener_family_name()) != NULL) {
-                runner_add_arg (&runner, "--xlator-option");
-                runner_argprintf (&runner, 
-                                  "%s-server.transport.address-family=%s",
-                                  volinfo->volname, family_name);
-        }
-
         if (volinfo->transport_type != GF_TRANSPORT_BOTH_TCP_RDMA) {
                 runner_argprintf (&runner, "%d", port);
         } else {