Skip to content

Commit

Permalink
drbd: drbd_send_ping(), drbd_send_ping(): Return 0 upon success and a…
Browse files Browse the repository at this point in the history
…n error code otherwise

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
  • Loading branch information
Andreas Gruenbacher authored and Philipp Reisner committed Nov 8, 2012
1 parent 8b924f1 commit a17647a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/block/drbd/drbd_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions drivers/block/drbd/drbd_receiver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit a17647a

Please sign in to comment.