1 files changed, 0 insertions, 25 deletions

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index c3760f33d52c..9043772de400 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -337,23 +337,6 @@ bail:
 }
 
 
-/* In C_AHEAD mode only out_of_sync packets are sent for requests. Detach
- * those requests from the newsest barrier when changing to an other cstate.
- *
- * That headless list vanishes when the last request finished its write or
- * send out_of_sync packet.  */
-static void tl_forget(struct drbd_conf *mdev)
-{
-        struct drbd_tl_epoch *b;
-
-        if (test_bit(CREATE_BARRIER, &mdev->flags))
-                return;
-
-        b = mdev->newest_tle;
-        list_del(&b->requests);
-        _tl_add_barrier(mdev, b);
-}
-
 /**
  * _tl_restart() - Walks the transfer log, and applies an action to all requests
  * @mdev:       DRBD device.
@@ -1265,14 +1248,6 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns,
         if (os.conn < C_CONNECTED && ns.conn >= C_CONNECTED)
                 drbd_resume_al(mdev);
 
-        /* Start a new epoch in case we start to mirror write requests */
-        if (!drbd_should_do_remote(os) && drbd_should_do_remote(ns))
-                tl_forget(mdev);
-
-        /* Do not add local-only requests to an epoch with mirrored requests */
-        if (drbd_should_do_remote(os) && !drbd_should_do_remote(ns))
-                set_bit(CREATE_BARRIER, &mdev->flags);
-
         ascw = kmalloc(sizeof(*ascw), GFP_ATOMIC);
         if (ascw) {
                 ascw->os = os;