Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20ee6390 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: cleaned up __set_current_state() followed by schedule_timeout() calls 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 6a35c45f

drivers/block/drbd/drbd_nl.c

+1 −2
Original line number Diff line number Diff line
@@ -360,8 +360,7 @@ drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force) 
		if (rv == SS_TWO_PRIMARIES) {

			/* Maybe the peer is detected as dead very soon...

			   retry at most once more in this case. */

			__set_current_state(TASK_INTERRUPTIBLE);

			schedule_timeout((mdev->net_conf->ping_timeo+1)*HZ/10);

			schedule_timeout_interruptible((mdev->net_conf->ping_timeo+1)*HZ/10);

			if (try < max_tries)

				try = max_tries - 1;

			continue;

drivers/block/drbd/drbd_receiver.c

+3 −6
Original line number Diff line number Diff line
@@ -768,8 +768,7 @@ static int drbd_connect(struct drbd_conf *mdev) 
			if (s || ++try >= 3)

				break;

			/* give the other side time to call bind() & listen() */

			__set_current_state(TASK_INTERRUPTIBLE);

			schedule_timeout(HZ / 10);

			schedule_timeout_interruptible(HZ / 10);

		}



		if (s) {
@@ -788,8 +787,7 @@ static int drbd_connect(struct drbd_conf *mdev) 
		}



		if (sock && msock) {

			__set_current_state(TASK_INTERRUPTIBLE);

			schedule_timeout(HZ / 10);

			schedule_timeout_interruptible(HZ / 10);

			ok = drbd_socket_okay(mdev, &sock);

			ok = drbd_socket_okay(mdev, &msock) && ok;

			if (ok)
@@ -4142,8 +4140,7 @@ int drbdd_init(struct drbd_thread *thi) 
		h = drbd_connect(mdev);

		if (h == 0) {

			drbd_disconnect(mdev);

			__set_current_state(TASK_INTERRUPTIBLE);

			schedule_timeout(HZ);

			schedule_timeout_interruptible(HZ);

		}

		if (h == -1) {

			dev_warn(DEV, "Discarding network configuration.\n");

drivers/block/drbd/drbd_worker.c

+1 −2
Original line number Diff line number Diff line
@@ -777,8 +777,7 @@ int drbd_resync_finished(struct drbd_conf *mdev) 
		 * queue (or even the read operations for those packets

		 * is not finished by now).   Retry in 100ms. */



		__set_current_state(TASK_INTERRUPTIBLE);

		schedule_timeout(HZ / 10);

		schedule_timeout_interruptible(HZ / 10);

		w = kmalloc(sizeof(struct drbd_work), GFP_ATOMIC);

		if (w) {

			w->cb = w_resync_finished;