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

Commit bc317a9e authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

drbd: dequeue single work items in wait_for_work() 



As long as we still use drbd_queue_work_front(),
we must only dequeue the single first item during normal operation.

The comment in drbd_worker() even says so,
but bc8a5a1 drbd: remove struct drbd_tl_epoch objects (barrier works)
introduced the batch dequeueing again via list_splice_init() in
wait_for_work().

Change back to list_move() of the first item, if any.

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

drivers/block/drbd/drbd_worker.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1792,7 +1792,10 @@ void wait_for_work(struct drbd_tconn *connection, struct list_head *work_list) 
		prepare_to_wait(&connection->sender_work.q_wait, &wait, TASK_INTERRUPTIBLE);

		prepare_to_wait(&connection->sender_work.q_wait, &wait, TASK_INTERRUPTIBLE);

		spin_lock_irq(&connection->req_lock);

		spin_lock_irq(&connection->req_lock);

		spin_lock(&connection->sender_work.q_lock);	/* FIXME get rid of this one? */

		spin_lock(&connection->sender_work.q_lock);	/* FIXME get rid of this one? */

		list_splice_init(&connection->sender_work.q, work_list);

		/* dequeue single item only,

		 * we still use drbd_queue_work_front() in some places */

		if (!list_empty(&connection->sender_work.q))

			list_move(connection->sender_work.q.next, work_list);

		spin_unlock(&connection->sender_work.q_lock);	/* FIXME get rid of this one? */

		spin_unlock(&connection->sender_work.q_lock);	/* FIXME get rid of this one? */

		if (!list_empty(work_list) || signal_pending(current)) {

		if (!list_empty(work_list) || signal_pending(current)) {

			spin_unlock_irq(&connection->req_lock);

			spin_unlock_irq(&connection->req_lock);