diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2012-08-22 05:47:14 -0400 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-09 08:08:21 -0500 |
| commit | bc317a9ecd641b78a4b237cb22b30ecf11443c77 (patch) | |
| tree | a7c97ada41d22ff2f7fb7aae8bd025818e79a458 /drivers/block/drbd | |
| parent | c02abda2b28734a7e97e15db866507b3cb92b7d0 (diff) | |
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: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index c674f17773a6..859afdfe5a08 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c | |||
| @@ -1792,7 +1792,10 @@ void wait_for_work(struct drbd_tconn *connection, struct list_head *work_list) | |||
| 1792 | prepare_to_wait(&connection->sender_work.q_wait, &wait, TASK_INTERRUPTIBLE); | 1792 | prepare_to_wait(&connection->sender_work.q_wait, &wait, TASK_INTERRUPTIBLE); |
| 1793 | spin_lock_irq(&connection->req_lock); | 1793 | spin_lock_irq(&connection->req_lock); |
| 1794 | spin_lock(&connection->sender_work.q_lock); /* FIXME get rid of this one? */ | 1794 | spin_lock(&connection->sender_work.q_lock); /* FIXME get rid of this one? */ |
| 1795 | list_splice_init(&connection->sender_work.q, work_list); | 1795 | /* dequeue single item only, |
| 1796 | * we still use drbd_queue_work_front() in some places */ | ||
| 1797 | if (!list_empty(&connection->sender_work.q)) | ||
| 1798 | list_move(connection->sender_work.q.next, work_list); | ||
| 1796 | spin_unlock(&connection->sender_work.q_lock); /* FIXME get rid of this one? */ | 1799 | spin_unlock(&connection->sender_work.q_lock); /* FIXME get rid of this one? */ |
| 1797 | if (!list_empty(work_list) || signal_pending(current)) { | 1800 | if (!list_empty(work_list) || signal_pending(current)) { |
| 1798 | spin_unlock_irq(&connection->req_lock); | 1801 | spin_unlock_irq(&connection->req_lock); |