Skip to content

Commit

Permalink
drbd: Converted got_Ping() and got_PingAck() from mdev to tconn
Browse files Browse the repository at this point in the history 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
  • Loading branch information
Philipp Reisner committed Nov 3, 2012
1 parent a4fbda8 commit f19e4f8
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/block/drbd/drbd_receiver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4441,15 +4441,14 @@ static int got_RqSReply(struct drbd_conf *mdev, enum drbd_packet cmd)
return true;
}

static int got_Ping(struct drbd_conf *mdev, enum drbd_packet cmd)
static int got_Ping(struct drbd_tconn *tconn, enum drbd_packet cmd)
{
return drbd_send_ping_ack(mdev->tconn);
return drbd_send_ping_ack(tconn);

}

static int got_PingAck(struct drbd_conf *mdev, enum drbd_packet cmd)
static int got_PingAck(struct drbd_tconn *tconn, enum drbd_packet cmd)
{
struct drbd_tconn *tconn = mdev->tconn;
/* restore idle timeout */
tconn->meta.socket->sk->sk_rcvtimeo = tconn->net_conf->ping_int*HZ;
if (!test_and_set_bit(GOT_PING_ACK, &tconn->flags))
Expand Down Expand Up @@ -4729,8 +4728,8 @@ struct asender_cmd {
};

static struct asender_cmd asender_tbl[] = {
[P_PING] = { sizeof(struct p_header), MDEV, { got_Ping } },
[P_PING_ACK] = { sizeof(struct p_header), MDEV, { got_PingAck } },
[P_PING] = { sizeof(struct p_header), CONN, { .conn_fn = got_Ping } },
[P_PING_ACK] = { sizeof(struct p_header), CONN, { .conn_fn = got_PingAck } },
[P_RECV_ACK] = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },
[P_WRITE_ACK] = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },
[P_RS_WRITE_ACK] = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },
Expand Down

0 comments on commit f19e4f8

Please sign in to comment.