drbd: drbd_send_ping(), drbd_send_ping(): Return 0 upon success and an error code...

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 064680c75648e0b3656e7391b967bfb4307108eb..7e766ff94e1ae65aebc4306df310a73b127cd7c8 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -768,13 +768,13 @@ int conn_send_cmd2(struct drbd_tconn *tconn, enum drbd_packet cmd, char *data,
 int drbd_send_ping(struct drbd_tconn *tconn)
 {
        struct p_header h;
-       return !conn_send_cmd(tconn, 0, &tconn->meta, P_PING, &h, sizeof(h));
+       return conn_send_cmd(tconn, 0, &tconn->meta, P_PING, &h, sizeof(h));
 }
 
 int drbd_send_ping_ack(struct drbd_tconn *tconn)
 {
        struct p_header h;
-       return !conn_send_cmd(tconn, 0, &tconn->meta, P_PING_ACK, &h, sizeof(h));
+       return conn_send_cmd(tconn, 0, &tconn->meta, P_PING_ACK, &h, sizeof(h));
 }
 
 int drbd_send_sync_param(struct drbd_conf *mdev)

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 9ad8dd3a84818a29a371641fd086255e92ba4bef..61104dbb01720a1a126c34f65d94094ae53ed7ad 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4498,7 +4498,7 @@ static int got_RqSReply(struct drbd_tconn *tconn, struct packet_info *pi)
 
 static int got_Ping(struct drbd_tconn *tconn, struct packet_info *pi)
 {
-       return drbd_send_ping_ack(tconn);
+       return !drbd_send_ping_ack(tconn);
 
 }
 
@@ -4851,7 +4851,7 @@ int drbd_asender(struct drbd_thread *thi)
        while (get_t_state(thi) == RUNNING) {
                drbd_thread_current_set_cpu(thi);
                if (test_and_clear_bit(SEND_PING, &tconn->flags)) {
-                       if (!drbd_send_ping(tconn)) {
+                       if (drbd_send_ping(tconn)) {
                                conn_err(tconn, "drbd_send_ping has failed\n");
                                goto reconnect;
                        }