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_nl.c | |
| parent | 0cfac5dd904ec8b376beb27f6ad265b12d71bf9e (diff) | |
| download | linux-next-43de7c852b12170a17e397862210d2fc7eb7eaf2.tar.gz | |
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_nl.c')
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index c50c1753aa9a..b342c95b724b 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -654,7 +654,7 @@ drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force) /* if this was forced, we should consider sync */ if (forced) drbd_send_uuids(mdev); - drbd_send_state(mdev); + drbd_send_current_state(mdev); } drbd_md_sync(mdev); |