diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2011-11-14 15:42:37 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:58:34 +0100 |
| commit | d5b27b01f17ef1f0badc45f9eea521be3457c9cb (patch) | |
| tree | e0760531801c0b5b51ea8b3f05f9c0c5d85ff60e /drivers/block/drbd/drbd_state.c | |
| parent | drbd: allow to dequeue batches of work at a time (diff) | |
| download | linux-d5b27b01f17ef1f0badc45f9eea521be3457c9cb.tar.xz linux-d5b27b01f17ef1f0badc45f9eea521be3457c9cb.zip | |
drbd: move the drbd_work_queue from drbd_socket to drbd_connection
cherry-picked and adapted from drbd 9 devel branch
In 8.4, we don't distinguish between "resource work" and "connection
work" yet, we have one worker for both, as we still have only one connection.
We only ever used the "data.work",
no need to keep the "meta.work" around.
Move tconn->data.work to tconn->sender_work.
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_state.c')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index dd618b5346f2..84a5072d7370 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -1090,7 +1090,7 @@ __drbd_set_state(struct drbd_conf *mdev, union drbd_state ns, ascw->w.cb = w_after_state_ch; ascw->w.mdev = mdev; ascw->done = done; - drbd_queue_work(&mdev->tconn->data.work, &ascw->w); + drbd_queue_work(&mdev->tconn->sender_work, &ascw->w); } else { dev_err(DEV, "Could not kmalloc an ascw\n"); } @@ -1764,7 +1764,7 @@ _conn_request_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_ acscw->w.cb = w_after_conn_state_ch; kref_get(&tconn->kref); acscw->w.tconn = tconn; - drbd_queue_work(&tconn->data.work, &acscw->w); + drbd_queue_work(&tconn->sender_work, &acscw->w); } else { conn_err(tconn, "Could not kmalloc an acscw\n"); } |