]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drbd: Fix drbdsetup wait-connect, wait-sync etc... commands
authorPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 6 Dec 2012 09:34:34 +0000 (10:34 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 6 Dec 2012 12:04:34 +0000 (13:04 +0100)
This was introduces when moving the code over from the 8.3 codebase
with commit 328e0f125bf41f4f33f684db22015f92cb44fe56

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_nl.c

index 536f94a1ba5d19671d33c129a0280efca7b214ca..2af26fc9528083d23cbde63fbe42128a26757599 100644 (file)
@@ -3297,11 +3297,12 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
        unsigned seq;
        int err = -ENOMEM;
 
-       if (sib->sib_reason == SIB_SYNC_PROGRESS &&
-           time_after(jiffies, mdev->rs_last_bcast + HZ))
-               mdev->rs_last_bcast = jiffies;
-       else
-               return;
+       if (sib->sib_reason == SIB_SYNC_PROGRESS) {
+               if (time_after(jiffies, mdev->rs_last_bcast + HZ))
+                       mdev->rs_last_bcast = jiffies;
+               else
+                       return;
+       }
 
        seq = atomic_inc_return(&drbd_genl_seq);
        msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);