aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-02-07 09:43:45 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-09-28 04:29:49 -0400
commita25b63f1e75df7dbc27666b627e6277d7fea92b7 (patch)
treeb4e3bbb88ff0b08253ae4e395e00f204a03fb592
parentdbd9eea094964e31c718ad8ade7c296d9e9da758 (diff)
drbd: Converted drbd_recv_fp() from mdev to tconn
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
-rw-r--r--drivers/block/drbd/drbd_receiver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 8d048df04a30..60a4f651a084 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -704,9 +704,9 @@ static int drbd_send_fp(struct drbd_tconn *tconn, struct socket *sock, enum drbd
704 return _conn_send_cmd(tconn, 0, sock, cmd, h, sizeof(*h), 0); 704 return _conn_send_cmd(tconn, 0, sock, cmd, h, sizeof(*h), 0);
705} 705}
706 706
707static enum drbd_packet drbd_recv_fp(struct drbd_conf *mdev, struct socket *sock) 707static enum drbd_packet drbd_recv_fp(struct drbd_tconn *tconn, struct socket *sock)
708{ 708{
709 struct p_header80 *h = &mdev->tconn->data.rbuf.header.h80; 709 struct p_header80 *h = &tconn->data.rbuf.header.h80;
710 int rr; 710 int rr;
711 711
712 rr = drbd_recv_short(sock, h, sizeof(*h), 0); 712 rr = drbd_recv_short(sock, h, sizeof(*h), 0);
@@ -802,7 +802,7 @@ static int drbd_connect(struct drbd_conf *mdev)
802retry: 802retry:
803 s = drbd_wait_for_connect(mdev->tconn); 803 s = drbd_wait_for_connect(mdev->tconn);
804 if (s) { 804 if (s) {
805 try = drbd_recv_fp(mdev, s); 805 try = drbd_recv_fp(mdev->tconn, s);
806 drbd_socket_okay(&sock); 806 drbd_socket_okay(&sock);
807 drbd_socket_okay(&msock); 807 drbd_socket_okay(&msock);
808 switch (try) { 808 switch (try) {