drbd: Converted drbd_send_fp() from mdev to tconn
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_receiver.c b/drivers/block/drbd/drbd_receiver.c
index a5234f9..96622d7 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -698,16 +698,14 @@
return s_estab;
}
-static int drbd_send_fp(struct drbd_conf *mdev, struct socket *sock,
- enum drbd_packet cmd)
+static int drbd_send_fp(struct drbd_tconn *tconn, struct socket *sock, enum drbd_packet cmd)
{
- struct p_header *h = &mdev->tconn->data.sbuf.header;
+ struct p_header *h = &tconn->data.sbuf.header;
- return _drbd_send_cmd(mdev, sock, cmd, h, sizeof(*h), 0);
+ return _conn_send_cmd(tconn, 0, sock, cmd, h, sizeof(*h), 0);
}
-static enum drbd_packet drbd_recv_fp(struct drbd_conf *mdev,
- struct socket *sock)
+static enum drbd_packet drbd_recv_fp(struct drbd_conf *mdev, struct socket *sock)
{
struct p_header80 *h = &mdev->tconn->data.rbuf.header.h80;
int rr;
@@ -782,11 +780,11 @@
if (s) {
if (!sock) {
- drbd_send_fp(mdev, s, P_HAND_SHAKE_S);
+ drbd_send_fp(mdev->tconn, s, P_HAND_SHAKE_S);
sock = s;
s = NULL;
} else if (!msock) {
- drbd_send_fp(mdev, s, P_HAND_SHAKE_M);
+ drbd_send_fp(mdev->tconn, s, P_HAND_SHAKE_M);
msock = s;
s = NULL;
} else {