1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 53bf6182bac4..0fe220cfb9e9 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -931,6 +931,7 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns,
         enum drbd_state_rv rv = SS_SUCCESS;
         enum sanitize_state_warnings ssw;
         struct after_state_chg_work *ascw;
+        bool did_remote, should_do_remote;
 
         os = drbd_read_state(mdev);
 
@@ -981,11 +982,17 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns,
             (os.disk != D_DISKLESS && ns.disk == D_DISKLESS))
                 atomic_inc(&mdev->local_cnt);
 
+        did_remote = drbd_should_do_remote(mdev->state);
         mdev->state.i = ns.i;
+        should_do_remote = drbd_should_do_remote(mdev->state);
         mdev->tconn->susp = ns.susp;
         mdev->tconn->susp_nod = ns.susp_nod;
         mdev->tconn->susp_fen = ns.susp_fen;
 
+        /* put replicated vs not-replicated requests in seperate epochs */
+        if (did_remote != should_do_remote)
+                start_new_tl_epoch(mdev->tconn);
+
         if (os.disk == D_ATTACHING && ns.disk >= D_NEGOTIATING)
                 drbd_print_uuids(mdev, "attached to UUIDs");