aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2012-12-06 04:34:34 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-12-06 07:04:34 -0500
commitef86b77957a97315d43ff72c9b83361ba1a07963 (patch)
tree3058caac35c58b5ea92453163e00dd3a7cac57c5
parent13c76aba7846647f86d479293ae0a0adc1ca840a (diff)
drbd: Fix drbdsetup wait-connect, wait-sync etc... commands
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>
-rw-r--r--drivers/block/drbd/drbd_nl.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 536f94a1ba5d..2af26fc95280 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -3297,11 +3297,12 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
3297 unsigned seq; 3297 unsigned seq;
3298 int err = -ENOMEM; 3298 int err = -ENOMEM;
3299 3299
3300 if (sib->sib_reason == SIB_SYNC_PROGRESS && 3300 if (sib->sib_reason == SIB_SYNC_PROGRESS) {
3301 time_after(jiffies, mdev->rs_last_bcast + HZ)) 3301 if (time_after(jiffies, mdev->rs_last_bcast + HZ))
3302 mdev->rs_last_bcast = jiffies; 3302 mdev->rs_last_bcast = jiffies;
3303 else 3303 else
3304 return; 3304 return;
3305 }
3305 3306
3306 seq = atomic_inc_return(&drbd_genl_seq); 3307 seq = atomic_inc_return(&drbd_genl_seq);
3307 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO); 3308 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);