drbd: _conn_send_cmd(), _drbd_send_cmd(): Pass a struct drbd_socket instead of a plain socket
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 bfec09a..40cecd6 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -729,7 +729,7 @@
return s_estab;
}
-static int drbd_send_fp(struct drbd_tconn *tconn, struct socket *sock, enum drbd_packet cmd)
+static int drbd_send_fp(struct drbd_tconn *tconn, struct drbd_socket *sock, enum drbd_packet cmd)
{
struct p_header *h = tconn->data.sbuf;
@@ -738,13 +738,13 @@
static enum drbd_packet drbd_recv_fp(struct drbd_tconn *tconn, struct socket *sock)
{
- struct p_header80 *h = tconn->data.rbuf;
+ struct p_header80 h;
int rr;
- rr = drbd_recv_short(sock, h, sizeof(*h), 0);
+ rr = drbd_recv_short(sock, &h, sizeof(h), 0);
- if (rr == sizeof(*h) && h->magic == cpu_to_be32(DRBD_MAGIC))
- return be16_to_cpu(h->command);
+ if (rr == sizeof(h) && h.magic == cpu_to_be32(DRBD_MAGIC))
+ return be16_to_cpu(h.command);
return 0xffff;
}
@@ -833,10 +833,10 @@
if (s) {
if (!tconn->data.socket) {
tconn->data.socket = s;
- drbd_send_fp(tconn, tconn->data.socket, P_HAND_SHAKE_S);
+ drbd_send_fp(tconn, &tconn->data, P_HAND_SHAKE_S);
} else if (!tconn->meta.socket) {
tconn->meta.socket = s;
- drbd_send_fp(tconn, tconn->meta.socket, P_HAND_SHAKE_M);
+ drbd_send_fp(tconn, &tconn->meta, P_HAND_SHAKE_M);
} else {
conn_err(tconn, "Logic error in drbd_connect()\n");
goto out_release_sockets;
@@ -4195,7 +4195,7 @@
memset(p, 0, sizeof(*p));
p->protocol_min = cpu_to_be32(PRO_VERSION_MIN);
p->protocol_max = cpu_to_be32(PRO_VERSION_MAX);
- err = _conn_send_cmd(tconn, 0, tconn->data.socket, P_HAND_SHAKE,
+ err = _conn_send_cmd(tconn, 0, &tconn->data, P_HAND_SHAKE,
&p->head, sizeof(*p), 0);
mutex_unlock(&tconn->data.mutex);
return err;