lkml.org 
[lkml]   [2011]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 080/118] drbd: Converted drbd_recv_fp() from mdev to tconn
Date
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---
drivers/block/drbd/drbd_receiver.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 2e1972e..080c91b 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
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) {
--
1.7.4.1


\
 
 \ /
  Last update: 2011-08-25 17:23    [W:0.431 / U:3.484 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site