kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drbd: Converted drbd_do_handshake() from mdev to tconn

Browse source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2011-02-07 17:35:59 +01:00
parent 9ba7aa00ae
commit 65d11ed6f2
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/block/drbd/drbd_receiver.c
View file

@ -60,7 +60,7 @@ enum finish_epoch {
FE_RECYCLED, FE_RECYCLED,
}; };
static int drbd_do_handshake(struct drbd_conf *mdev); static int drbd_do_handshake(struct drbd_tconn *tconn);
static int drbd_do_auth(struct drbd_conf *mdev); static int drbd_do_auth(struct drbd_conf *mdev);
static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *, struct drbd_epoch *, enum epoch_event); static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *, struct drbd_epoch *, enum epoch_event);
@ -883,7 +883,7 @@ retry:
D_ASSERT(mdev->tconn->asender.task == NULL); D_ASSERT(mdev->tconn->asender.task == NULL);
h = drbd_do_handshake(mdev); h = drbd_do_handshake(mdev->tconn);
if (h <= 0) if (h <= 0)
return h; return h;
@ -3991,39 +3991,39 @@ static int drbd_send_handshake(struct drbd_tconn *tconn)
* -1 peer talks different language, * -1 peer talks different language,
* no point in trying again, please go standalone. * no point in trying again, please go standalone.
*/ */
static int drbd_do_handshake(struct drbd_conf *mdev) static int drbd_do_handshake(struct drbd_tconn *tconn)
{ {
/* ASSERT current == mdev->tconn->receiver ... */ /* ASSERT current == tconn->receiver ... */
struct p_handshake *p = &mdev->tconn->data.rbuf.handshake; struct p_handshake *p = &tconn->data.rbuf.handshake;
const int expect = sizeof(struct p_handshake) - sizeof(struct p_header80); const int expect = sizeof(struct p_handshake) - sizeof(struct p_header80);
struct packet_info pi; struct packet_info pi;
int rv; int rv;
rv = drbd_send_handshake(mdev->tconn); rv = drbd_send_handshake(tconn);
if (!rv) if (!rv)
return 0; return 0;
rv = drbd_recv_header(mdev->tconn, &pi); rv = drbd_recv_header(tconn, &pi);
if (!rv) if (!rv)
return 0; return 0;
if (pi.cmd != P_HAND_SHAKE) { if (pi.cmd != P_HAND_SHAKE) {
dev_err(DEV, "expected HandShake packet, received: %s (0x%04x)\n", conn_err(tconn, "expected HandShake packet, received: %s (0x%04x)\n",
cmdname(pi.cmd), pi.cmd); cmdname(pi.cmd), pi.cmd);
return -1; return -1;
} }
if (pi.size != expect) { if (pi.size != expect) {
dev_err(DEV, "expected HandShake length: %u, received: %u\n", conn_err(tconn, "expected HandShake length: %u, received: %u\n",
expect, pi.size); expect, pi.size);
return -1; return -1;
} }
rv = drbd_recv(mdev->tconn, &p->head.payload, expect); rv = drbd_recv(tconn, &p->head.payload, expect);
if (rv != expect) { if (rv != expect) {
if (!signal_pending(current)) if (!signal_pending(current))
dev_warn(DEV, "short read receiving handshake packet: l=%u\n", rv); conn_warn(tconn, "short read receiving handshake packet: l=%u\n", rv);
return 0; return 0;
} }
@ -4036,15 +4036,15 @@ static int drbd_do_handshake(struct drbd_conf *mdev)
PRO_VERSION_MIN > p->protocol_max) PRO_VERSION_MIN > p->protocol_max)
goto incompat; goto incompat;
mdev->tconn->agreed_pro_version = min_t(int, PRO_VERSION_MAX, p->protocol_max); tconn->agreed_pro_version = min_t(int, PRO_VERSION_MAX, p->protocol_max);
dev_info(DEV, "Handshake successful: " conn_info(tconn, "Handshake successful: "
"Agreed network protocol version %d\n", mdev->tconn->agreed_pro_version); "Agreed network protocol version %d\n", tconn->agreed_pro_version);
return 1; return 1;
incompat: incompat:
dev_err(DEV, "incompatible DRBD dialects: " conn_err(tconn, "incompatible DRBD dialects: "
"I support %d-%d, peer supports %d-%d\n", "I support %d-%d, peer supports %d-%d\n",
PRO_VERSION_MIN, PRO_VERSION_MAX, PRO_VERSION_MIN, PRO_VERSION_MAX,
p->protocol_min, p->protocol_max); p->protocol_min, p->protocol_max);