leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drbd: In the worker thread, process drbd_work instead of drbd_device_work items

Browse Source 
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
This commit is contained in:
Andreas Gruenbacher 2011-08-26 23:50:08 +02:00 committed by Philipp Reisner
parent d448a2e1e3
commit 6db7e50a8a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/block/drbd/drbd_worker.c
View File

@ -1888,7 +1888,7 @@ static void wait_for_work(struct drbd_connection *connection, struct list_head *
int drbd_worker(struct drbd_thread *thi) int drbd_worker(struct drbd_thread *thi)
{ {
struct drbd_connection *connection = thi->connection; struct drbd_connection *connection = thi->connection;
struct drbd_device_work *dw = NULL; struct drbd_work *w = NULL;
struct drbd_peer_device *peer_device; struct drbd_peer_device *peer_device;
LIST_HEAD(work_list); LIST_HEAD(work_list);
int vnr; int vnr;
@ -1914,9 +1914,9 @@ int drbd_worker(struct drbd_thread *thi)
break; break;
while (!list_empty(&work_list)) { while (!list_empty(&work_list)) {
dw = list_first_entry(&work_list, struct drbd_device_work, w.list); w = list_first_entry(&work_list, struct drbd_work, list);
list_del_init(&dw->w.list); list_del_init(&w->list);
if (dw->w.cb(&dw->w, connection->cstate < C_WF_REPORT_PARAMS) == 0) if (w->cb(w, connection->cstate < C_WF_REPORT_PARAMS) == 0)
continue; continue;
if (connection->cstate >= C_WF_REPORT_PARAMS) if (connection->cstate >= C_WF_REPORT_PARAMS)
conn_request_state(connection, NS(conn, C_NETWORK_FAILURE), CS_HARD); conn_request_state(connection, NS(conn, C_NETWORK_FAILURE), CS_HARD);
@ -1925,9 +1925,9 @@ int drbd_worker(struct drbd_thread *thi)
do { do {
while (!list_empty(&work_list)) { while (!list_empty(&work_list)) {
dw = list_first_entry(&work_list, struct drbd_device_work, w.list); w = list_first_entry(&work_list, struct drbd_work, list);
list_del_init(&dw->w.list); list_del_init(&w->list);
dw->w.cb(&dw->w, 1); w->cb(w, 1);
} }
dequeue_work_batch(&connection->sender_work, &work_list); dequeue_work_batch(&connection->sender_work, &work_list);
} while (!list_empty(&work_list)); } while (!list_empty(&work_list));