3 files changed, 14 insertions, 53 deletions

diff --git a/rpc/rpc-lib/src/libgfrpc.sym b/rpc/rpc-lib/src/libgfrpc.sym
index 4fab688c66d..a7cb5f6b5cb 100644
--- a/rpc/rpc-lib/src/libgfrpc.sym
+++ b/rpc/rpc-lib/src/libgfrpc.sym
@@ -10,11 +10,9 @@ rpc_clnt_reconnect
 rpc_clnt_reconnect_cleanup
 rpc_clnt_ref
 rpc_clnt_register_notify
-rpc_clnt_set_connected
 rpc_clnt_start
 rpc_clnt_submit
 rpc_clnt_unref
-rpc_clnt_unset_connected
 rpc_reply_to_xdr
 rpcsvc_auth_array
 rpcsvc_auth_check
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index 0471a268c66..330a96837e6 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -529,6 +529,7 @@ rpc_clnt_connection_cleanup (rpc_clnt_connection_t *conn)
                 }
 
                 conn->connected = 0;
+                conn->disconnected = 1;
 
                 unref = rpc_clnt_remove_ping_timer_locked (clnt);
                 /*reset rpc msgs stats*/
@@ -788,44 +789,6 @@ out:
         return ret;
 }
 
-
-void
-rpc_clnt_set_connected (rpc_clnt_connection_t *conn)
-{
-        if (!conn) {
-                goto out;
-        }
-
-        pthread_mutex_lock (&conn->lock);
-        {
-                conn->connected = 1;
-                conn->disconnected = _gf_false;
-        }
-        pthread_mutex_unlock (&conn->lock);
-
-out:
-        return;
-}
-
-
-void
-rpc_clnt_unset_connected (rpc_clnt_connection_t *conn)
-{
-        if (!conn) {
-                goto out;
-        }
-
-        pthread_mutex_lock (&conn->lock);
-        {
-                conn->connected = 0;
-                conn->disconnected = _gf_true;
-        }
-        pthread_mutex_unlock (&conn->lock);
-
-out:
-        return;
-}
-
 gf_boolean_t
 is_rpc_clnt_disconnected (rpc_clnt_connection_t *conn)
 {
@@ -1000,14 +963,19 @@ rpc_clnt_notify (rpc_transport_t *trans, void *mydata,
 
         case RPC_TRANSPORT_CONNECT:
         {
-
-                /* Every time there is a disconnection, processes
-                 * should try to connect to 'glusterd' (ie, default
-                 * port) or whichever port given as 'option remote-port'
-                 * in volume file. */
-                /* Below code makes sure the (re-)configured port lasts
-                 * for just one successful attempt */
-                conn->config.remote_port = 0;
+                pthread_mutex_lock (&conn->lock);
+                {
+                        /* Every time there is a disconnection, processes
+                         * should try to connect to 'glusterd' (ie, default
+                         * port) or whichever port given as 'option remote-port'
+                         * in volume file. */
+                        /* Below code makes sure the (re-)configured port lasts
+                         * for just one successful attempt */
+                        conn->config.remote_port = 0;
+                        conn->connected = 1;
+                        conn->disconnected = 0;
+                }
+                pthread_mutex_unlock (&conn->lock);
 
                 /* auth value should be set to lower version available
                  * and will be set to appropriate version supported by
diff --git a/rpc/rpc-lib/src/rpc-clnt.h b/rpc/rpc-lib/src/rpc-clnt.h
index ea81b41c180..2d6cb060c4e 100644
--- a/rpc/rpc-lib/src/rpc-clnt.h
+++ b/rpc/rpc-lib/src/rpc-clnt.h
@@ -235,11 +235,6 @@ rpc_clnt_unref (struct rpc_clnt *rpc);
 
 int rpc_clnt_connection_cleanup (rpc_clnt_connection_t *conn);
 int rpc_clnt_reconnect_cleanup (rpc_clnt_connection_t *conn);
-
-void rpc_clnt_set_connected (rpc_clnt_connection_t *conn);
-
-void rpc_clnt_unset_connected (rpc_clnt_connection_t *conn);
-
 gf_boolean_t is_rpc_clnt_disconnected (rpc_clnt_connection_t *conn);
 
 void rpc_clnt_reconnect (void *trans_ptr);