Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 13:58:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drbd: drbd_connected(): Return an error code upon failure.

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:
Andreas Gruenbacher 2011-03-24 14:31:22 +01:00 committed by Philipp Reisner
parent a5c3190435
commit 0829f5edf3
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/block/drbd/drbd_receiver.c
View File

@ -781,7 +781,7 @@ static int drbd_socket_okay(struct socket **sock)
int drbd_connected(int vnr, void *p, void *data) int drbd_connected(int vnr, void *p, void *data)
{ {
struct drbd_conf *mdev = (struct drbd_conf *)p; struct drbd_conf *mdev = (struct drbd_conf *)p;
int ok = 1; int err;
atomic_set(&mdev->packet_seq, 0); atomic_set(&mdev->packet_seq, 0);
mdev->peer_seq = 0; mdev->peer_seq = 0;
@ -790,15 +790,16 @@ int drbd_connected(int vnr, void *p, void *data)
&mdev->tconn->cstate_mutex : &mdev->tconn->cstate_mutex :
&mdev->own_state_mutex; &mdev->own_state_mutex;
ok &= !drbd_send_sync_param(mdev); err = drbd_send_sync_param(mdev);
ok &= !drbd_send_sizes(mdev, 0, 0); if (!err)
ok &= !drbd_send_uuids(mdev); err = drbd_send_sizes(mdev, 0, 0);
ok &= !drbd_send_state(mdev); if (!err)
err = drbd_send_uuids(mdev);
if (!err)
err = drbd_send_state(mdev);
clear_bit(USE_DEGR_WFC_T, &mdev->flags); clear_bit(USE_DEGR_WFC_T, &mdev->flags);
clear_bit(RESIZE_PENDING, &mdev->flags); clear_bit(RESIZE_PENDING, &mdev->flags);
return err;
return !ok;
} }
/* /*