Skip to content

Commit

Permalink
drbd: drbd_send_handshake(): Return 0 upon success and an error code …
Browse files Browse the repository at this point in the history
…otherwise

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
  • Loading branch information
Andreas Gruenbacher authored and Philipp Reisner committed Nov 8, 2012
1 parent 927036f commit e8d17b0
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/block/drbd/drbd_receiver.c
Original file line number Diff line number Diff line change
Expand Up @@ -4135,25 +4135,25 @@ static int drbd_send_handshake(struct drbd_tconn *tconn)
{
/* ASSERT current == mdev->tconn->receiver ... */
struct p_handshake *p = &tconn->data.sbuf.handshake;
int ok;
int err;

if (mutex_lock_interruptible(&tconn->data.mutex)) {
conn_err(tconn, "interrupted during initial handshake\n");
return 0; /* interrupted. not ok. */
return -EINTR;
}

if (tconn->data.socket == NULL) {
mutex_unlock(&tconn->data.mutex);
return 0;
return -EIO;
}

memset(p, 0, sizeof(*p));
p->protocol_min = cpu_to_be32(PRO_VERSION_MIN);
p->protocol_max = cpu_to_be32(PRO_VERSION_MAX);
ok = !_conn_send_cmd(tconn, 0, tconn->data.socket, P_HAND_SHAKE,
err = _conn_send_cmd(tconn, 0, tconn->data.socket, P_HAND_SHAKE,
&p->head, sizeof(*p), 0);
mutex_unlock(&tconn->data.mutex);
return ok;
return err;
}

/*
Expand All @@ -4169,10 +4169,10 @@ static int drbd_do_handshake(struct drbd_tconn *tconn)
struct p_handshake *p = &tconn->data.rbuf.handshake;
const int expect = sizeof(struct p_handshake) - sizeof(struct p_header80);
struct packet_info pi;
int rv;
int err, rv;

rv = drbd_send_handshake(tconn);
if (!rv)
err = drbd_send_handshake(tconn);
if (err)
return 0;

rv = drbd_recv_header(tconn, &pi);
Expand Down

0 comments on commit e8d17b0

Please sign in to comment.