Commit a25b63f1 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Converted drbd_recv_fp() from mdev to tconn 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent dbd9eea0

drivers/block/drbd/drbd_receiver.c

+3 −3
Original line number Diff line number Diff line
@@ -704,9 +704,9 @@ static int drbd_send_fp(struct drbd_tconn *tconn, struct socket *sock, enum drbd 
	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_tconn *tconn, struct socket *sock)

{

	struct p_header80 *h = &mdev->tconn->data.rbuf.header.h80;

	struct p_header80 *h = &tconn->data.rbuf.header.h80;

	int rr;



	rr = drbd_recv_short(sock, h, sizeof(*h), 0);
@@ -802,7 +802,7 @@ static int drbd_connect(struct drbd_conf *mdev) 
retry:

		s = drbd_wait_for_connect(mdev->tconn);

		if (s) {

			try = drbd_recv_fp(mdev, s);

			try = drbd_recv_fp(mdev->tconn, s);

			drbd_socket_okay(&sock);

			drbd_socket_okay(&msock);

			switch (try) {