From 90c2f8819cc88b5122a65b4b9d41532c7f8fd5ab Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Thu, 24 Mar 2011 14:31:22 +0100 Subject: [PATCH] --- yaml --- r: 345940 b: refs/heads/master c: 0829f5edf37cb1731e97066288f520de85b7b5e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a22a64bf66b1..a91d95847845 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5c31904350182b0138f0bd1cec9bc2c4296f71f +refs/heads/master: 0829f5edf37cb1731e97066288f520de85b7b5e5 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 208a2ec54935..6a3e628b68c6 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -781,7 +781,7 @@ static int drbd_socket_okay(struct socket **sock) int drbd_connected(int vnr, void *p, void *data) { struct drbd_conf *mdev = (struct drbd_conf *)p; - int ok = 1; + int err; atomic_set(&mdev->packet_seq, 0); mdev->peer_seq = 0; @@ -790,15 +790,16 @@ int drbd_connected(int vnr, void *p, void *data) &mdev->tconn->cstate_mutex : &mdev->own_state_mutex; - ok &= !drbd_send_sync_param(mdev); - ok &= !drbd_send_sizes(mdev, 0, 0); - ok &= !drbd_send_uuids(mdev); - ok &= !drbd_send_state(mdev); + err = drbd_send_sync_param(mdev); + if (!err) + err = drbd_send_sizes(mdev, 0, 0); + if (!err) + err = drbd_send_uuids(mdev); + if (!err) + err = drbd_send_state(mdev); clear_bit(USE_DEGR_WFC_T, &mdev->flags); clear_bit(RESIZE_PENDING, &mdev->flags); - - - return !ok; + return err; } /*