drbd: in drbd_suspend_al, set AL_SUSPENDED before unlocking the activity log

As using an empty activity log is the whole point of the excercise,
make sure it is still empty when setting AL_SUSPENDED.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index d6832f8d49a5f72197a168a1646e0c6e76f45172..ae8f42e38e4f3be6008f5bc077bbfe24f1de7e59 100644 (file)
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -901,19 +901,17 @@ static void drbd_suspend_al(struct drbd_conf *mdev)
 {
        int s = 0;
 
-       if (lc_try_lock(mdev->act_log)) {
-               drbd_al_shrink(mdev);
-               lc_unlock(mdev->act_log);
-       } else {
+       if (!lc_try_lock(mdev->act_log)) {
                dev_warn(DEV, "Failed to lock al in drbd_suspend_al()\n");
                return;
        }
 
+       drbd_al_shrink(mdev);
        spin_lock_irq(&mdev->tconn->req_lock);
        if (mdev->state.conn < C_CONNECTED)
                s = !test_and_set_bit(AL_SUSPENDED, &mdev->flags);
-
        spin_unlock_irq(&mdev->tconn->req_lock);
+       lc_unlock(mdev->act_log);
 
        if (s)
                dev_info(DEV, "Suspended AL updates\n");