2 files changed, 54 insertions, 46 deletions

diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index 447366c0deb..a36f6e435a7 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -1553,7 +1553,7 @@ client_query_portmap_cbk (struct rpc_req *req, struct iovec *iov, int count, voi
         rpc_clnt_reconfig (conf->rpc, &config);
 
         conf->skip_notify = 1;
-	conf->quick_reconnect = 1;
+        conf->quick_reconnect = 1;
 
 out:
         if (frame)
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index e8db8eed166..6cb5b6b38ca 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -464,7 +464,7 @@ int32_t
 client_forget (xlator_t *this, inode_t *inode)
 {
         /* Nothing here */
-	return 0;
+        return 0;
 }
 
 int32_t
@@ -542,7 +542,7 @@ out:
                 STACK_UNWIND_STRICT (lookup, frame, -1, ENOTCONN,
                                      NULL, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -568,7 +568,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (stat, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -597,7 +597,7 @@ out:
                 STACK_UNWIND_STRICT (truncate, frame, -1, ENOTCONN, NULL, NULL, NULL);
 
 
-	return 0;
+        return 0;
 }
 
 
@@ -625,7 +625,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (ftruncate, frame, -1, ENOTCONN, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -654,7 +654,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (access, frame, -1, ENOTCONN, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -684,7 +684,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (readlink, frame, -1, ENOTCONN, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -715,7 +715,7 @@ out:
                 STACK_UNWIND_STRICT (mknod, frame, -1, ENOTCONN,
                                      NULL, NULL, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -745,7 +745,7 @@ out:
                 STACK_UNWIND_STRICT (mkdir, frame, -1, ENOTCONN,
                                      NULL, NULL, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -775,7 +775,7 @@ out:
                 STACK_UNWIND_STRICT (unlink, frame, -1, ENOTCONN,
                                      NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 int32_t
@@ -804,7 +804,7 @@ out:
                 STACK_UNWIND_STRICT (rmdir, frame, -1, ENOTCONN,
                                      NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -834,7 +834,7 @@ out:
                 STACK_UNWIND_STRICT (symlink, frame, -1, ENOTCONN,
                                      NULL, NULL, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -864,7 +864,7 @@ out:
                 STACK_UNWIND_STRICT (rename, frame, -1, ENOTCONN,
                                      NULL, NULL, NULL, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -894,7 +894,7 @@ out:
                 STACK_UNWIND_STRICT (link, frame, -1, ENOTCONN,
                                      NULL, NULL, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -929,7 +929,7 @@ out:
                 STACK_UNWIND_STRICT (create, frame, -1, ENOTCONN,
                                      NULL, NULL, NULL, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -962,7 +962,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (open, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -997,7 +997,7 @@ out:
                 STACK_UNWIND_STRICT (readv, frame, -1, ENOTCONN,
                                      NULL, 0, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1035,7 +1035,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (writev, frame, -1, ENOTCONN, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1061,7 +1061,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (flush, frame, -1, ENOTCONN, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1090,7 +1090,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (fsync, frame, -1, ENOTCONN, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1117,7 +1117,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (fstat, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1146,7 +1146,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (opendir, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1174,7 +1174,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (fsyncdir, frame, -1, ENOTCONN, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1201,7 +1201,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (statfs, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 static gf_boolean_t
@@ -1390,7 +1390,7 @@ out:
         if (need_unwind)
                 STACK_UNWIND_STRICT (setxattr, frame, op_ret, op_errno, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1420,7 +1420,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (fsetxattr, frame, -1, ENOTCONN, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1450,7 +1450,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (fgetxattr, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1479,7 +1479,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (getxattr, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1509,7 +1509,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (xattrop, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1539,7 +1539,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (fxattrop, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1568,7 +1568,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (removexattr, frame, -1, ENOTCONN, NULL);
 
-	return 0;
+        return 0;
 }
 
 int32_t
@@ -1595,7 +1595,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (fremovexattr, frame, -1, ENOTCONN, NULL);
 
-	return 0;
+        return 0;
 }
 
 int32_t
@@ -1651,7 +1651,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (lk, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1681,7 +1681,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (inodelk, frame, -1, ENOTCONN, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1712,7 +1712,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (finodelk, frame, -1, ENOTCONN, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1744,7 +1744,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (entrylk, frame, -1, ENOTCONN, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1777,7 +1777,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (fentrylk, frame, -1, ENOTCONN, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1806,7 +1806,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (rchecksum, frame, -1, ENOTCONN, 0, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 int32_t
@@ -1837,7 +1837,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (readdir, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1869,7 +1869,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (readdirp, frame, -1, ENOTCONN, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -1898,7 +1898,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (setattr, frame, -1, ENOTCONN, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 int32_t
@@ -1926,7 +1926,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (fsetattr, frame, -1, ENOTCONN, NULL, NULL, NULL);
 
-	return 0;
+        return 0;
 }
 
 int32_t
@@ -2152,7 +2152,7 @@ out:
         if (ret)
                 STACK_UNWIND_STRICT (getspec, frame, -1, EINVAL, NULL);
 
-	return 0;
+        return 0;
 }
 
 
@@ -2223,6 +2223,15 @@ client_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
         conf = this->private;
 
         switch (event) {
+        case RPC_CLNT_PING:
+        {
+                ret = default_notify (this, GF_EVENT_CHILD_PING, data);
+                if (ret)
+                        gf_log (this->name, GF_LOG_INFO,
+                                "CHILD_PING notify failed");
+                conf->last_sent_event = GF_EVENT_CHILD_PING;
+                break;
+        }
         case RPC_CLNT_CONNECT:
         {
                 conf->connected = 1;
@@ -2314,7 +2323,6 @@ client_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
 
                 } else {
                         rpc->conn.config.remote_port = 0;
-
                 }
 
                 break;
@@ -2666,7 +2674,7 @@ reconfigure (xlator_t *this, dict_t *options)
 
         ret = 0;
 out:
-	return ret;
+        return ret;
 
 }