leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drbd: Converted got_Ping() and got_PingAck() from mdev to tconn

Browse Source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2011-03-16 11:21:50 +01:00
parent a4fbda8eca
commit f19e4f8ba7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/block/drbd/drbd_receiver.c
View File

@ -4441,15 +4441,14 @@ static int got_RqSReply(struct drbd_conf *mdev, enum drbd_packet cmd)
return true; 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 */ /* restore idle timeout */
tconn->meta.socket->sk->sk_rcvtimeo = tconn->net_conf->ping_int*HZ; tconn->meta.socket->sk->sk_rcvtimeo = tconn->net_conf->ping_int*HZ;
if (!test_and_set_bit(GOT_PING_ACK, &tconn->flags)) if (!test_and_set_bit(GOT_PING_ACK, &tconn->flags))
@ -4729,8 +4728,8 @@ struct asender_cmd {
}; };
static struct asender_cmd asender_tbl[] = { static struct asender_cmd asender_tbl[] = {
[P_PING] = { sizeof(struct p_header), MDEV, { got_Ping } }, [P_PING] = { sizeof(struct p_header), CONN, { .conn_fn = got_Ping } },
[P_PING_ACK] = { sizeof(struct p_header), MDEV, { got_PingAck } }, [P_PING_ACK] = { sizeof(struct p_header), CONN, { .conn_fn = got_PingAck } },
[P_RECV_ACK] = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } }, [P_RECV_ACK] = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },
[P_WRITE_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 } }, [P_RS_WRITE_ACK] = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },