1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 23670d81ec32..ceebd31eddb9 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -655,7 +655,6 @@ drbd_set_role(struct drbd_device *const device, enum drbd_role new_role, int for
         /* FIXME also wait for all pending P_BARRIER_ACK? */
 
         if (new_role == R_SECONDARY) {
-                set_disk_ro(device->vdisk, true);
                 if (get_ldev(device)) {
                         device->ldev->md.uuid[UI_CURRENT] &= ~(u64)1;
                         put_ldev(device);
@@ -667,7 +666,6 @@ drbd_set_role(struct drbd_device *const device, enum drbd_role new_role, int for
                         nc->discard_my_data = 0; /* without copy; single bit op is atomic */
                 mutex_unlock(&device->resource->conf_update);
 
-                set_disk_ro(device->vdisk, false);
                 if (get_ldev(device)) {
                         if (((device->state.conn < C_CONNECTED ||
                                device->state.pdsk <= D_FAILED)
@@ -690,7 +688,7 @@ drbd_set_role(struct drbd_device *const device, enum drbd_role new_role, int for
         }
 
         drbd_md_sync(device);
-
+        set_disk_ro(device->vdisk, new_role == R_SECONDARY);
         kobject_uevent(&disk_to_dev(device->vdisk)->kobj, KOBJ_CHANGE);
 out:
         mutex_unlock(device->state_mutex);