diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-11-10 13:16:13 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:58:06 +0100 |
| commit | 43de7c852b12170a17e397862210d2fc7eb7eaf2 (patch) | |
| tree | 64c834e347d610b0c1d42f7d04673683e99d9971 /drivers/block/drbd/drbd_receiver.c | |
| parent | 0cfac5dd904ec8b376beb27f6ad265b12d71bf9e (diff) | |
drbd: Fixes from the drbd-8.3 branch
* drbd-8.3:
drbd: O_SYNC gives EIO on ramdisks for some kernels (eg. RHEL6).
drbd: send intermediate state change results to the peer
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index e823968f1cd..ed1fa3f7cc4 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -825,7 +825,7 @@ int drbd_connected(struct drbd_conf *mdev) if (!err) err = drbd_send_uuids(mdev); if (!err) - err = drbd_send_state(mdev); + err = drbd_send_current_state(mdev); clear_bit(USE_DEGR_WFC_T, &mdev->flags); clear_bit(RESIZE_PENDING, &mdev->flags); mod_timer(&mdev->request_timer, jiffies + HZ); /* just start it here. */ @@ -3873,7 +3873,7 @@ static int receive_state(struct drbd_tconn *tconn, struct packet_info *pi) /* Nowadays only used when forcing a node into primary role and setting its disk to UpToDate with that */ drbd_send_uuids(mdev); - drbd_send_state(mdev); + drbd_send_current_state(mdev); } } |