diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-01-18 09:28:59 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 05:47:42 -0500 |
commit | 20ee639024e3d33111df0e343050b218c656bf16 (patch) | |
tree | bb19ee90dfbea96d0e11c1bd4c0dc0655638001c /drivers/block/drbd/drbd_nl.c | |
parent | 6a35c45f890dc18c5527ac501b308058118f20e7 (diff) |
drbd: cleaned up __set_current_state() followed by schedule_timeout() calls
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_nl.c')
-rw-r--r-- | drivers/block/drbd/drbd_nl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index a46bc0287e21..42e16e4edfa3 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c | |||
@@ -360,8 +360,7 @@ drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force) | |||
360 | if (rv == SS_TWO_PRIMARIES) { | 360 | if (rv == SS_TWO_PRIMARIES) { |
361 | /* Maybe the peer is detected as dead very soon... | 361 | /* Maybe the peer is detected as dead very soon... |
362 | retry at most once more in this case. */ | 362 | retry at most once more in this case. */ |
363 | __set_current_state(TASK_INTERRUPTIBLE); | 363 | schedule_timeout_interruptible((mdev->net_conf->ping_timeo+1)*HZ/10); |
364 | schedule_timeout((mdev->net_conf->ping_timeo+1)*HZ/10); | ||
365 | if (try < max_tries) | 364 | if (try < max_tries) |
366 | try = max_tries - 1; | 365 | try = max_tries - 1; |
367 | continue; | 366 | continue; |