From 3a01b4e492431941f1a85d010dba647a631c4450 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 16 Mar 2011 11:21:50 +0100 Subject: [PATCH] --- yaml --- r: 345877 b: refs/heads/master c: f19e4f8ba7a785c7250c04715b020d7eb8eda00a h: refs/heads/master i: 345875: bb1f6999a271a84abe5c9c7aba7b603b35de23b7 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 67a2f3616e4e..33dcde2278b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4fbda8eca8a56527033bea8efd3190dbcf3acc6 +refs/heads/master: f19e4f8ba7a785c7250c04715b020d7eb8eda00a diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index ba350bd562c6..097ca71d1947 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -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)) @@ -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 } },