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_actlog.c | |
| parent | 8c0785a5c9a0f2472aff68dc32247be01728c416 (diff) | |
| download | op-kernel-dev-d5b27b01f17ef1f0badc45f9eea521be3457c9cb.zip op-kernel-dev-d5b27b01f17ef1f0badc45f9eea521be3457c9cb.tar.gz | |
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_actlog.c')
| -rw-r--r-- | drivers/block/drbd/drbd_actlog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c index 83d48d2..f500dc5 100644 --- a/drivers/block/drbd/drbd_actlog.c +++ b/drivers/block/drbd/drbd_actlog.c @@ -485,7 +485,7 @@ static int al_write_transaction(struct drbd_conf *mdev) init_completion(&al_work.event); al_work.w.cb = w_al_write_transaction; al_work.w.mdev = mdev; - drbd_queue_work_front(&mdev->tconn->data.work, &al_work.w); + drbd_queue_work_front(&mdev->tconn->sender_work, &al_work.w); wait_for_completion(&al_work.event); return al_work.err; @@ -645,7 +645,7 @@ static void drbd_try_clear_on_disk_bm(struct drbd_conf *mdev, sector_t sector, udw->enr = ext->lce.lc_number; udw->w.cb = w_update_odbm; udw->w.mdev = mdev; - drbd_queue_work_front(&mdev->tconn->data.work, &udw->w); + drbd_queue_work_front(&mdev->tconn->sender_work, &udw->w); } else { dev_warn(DEV, "Could not kmalloc an udw\n"); } |
