Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 345940
b: refs/heads/master
c: 0829f5e
h: refs/heads/master
v: v3
  • Loading branch information
Andreas Gruenbacher authored and Philipp Reisner committed Nov 8, 2012
1 parent 26b7221 commit 90c2f88
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a5c31904350182b0138f0bd1cec9bc2c4296f71f
refs/heads/master: 0829f5edf37cb1731e97066288f520de85b7b5e5
17 changes: 9 additions & 8 deletions trunk/drivers/block/drbd/drbd_receiver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

/*
Expand Down

0 comments on commit 90c2f88

Please sign in to comment.