Commit 373a392b authored by Milan Broz's avatar Milan Broz Committed by Linus Torvalds

dm kcopyd: update dm io interface

This patch ports kcopyd.c to the new, scalable dm_io() interface.
Signed-off-by: default avatarMilan Broz <mbroz@redhat.com>
Signed-off-by: default avatarHeinz Mauelshagen <hjm@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c8b03afe
/* /*
* Copyright (C) 2002 Sistina Software (UK) Limited. * Copyright (C) 2002 Sistina Software (UK) Limited.
* Copyright (C) 2006 Red Hat GmbH
* *
* This file is released under the GPL. * This file is released under the GPL.
* *
...@@ -45,6 +46,8 @@ struct kcopyd_client { ...@@ -45,6 +46,8 @@ struct kcopyd_client {
unsigned int nr_pages; unsigned int nr_pages;
unsigned int nr_free_pages; unsigned int nr_free_pages;
struct dm_io_client *io_client;
wait_queue_head_t destroyq; wait_queue_head_t destroyq;
atomic_t nr_jobs; atomic_t nr_jobs;
}; };
...@@ -342,16 +345,20 @@ static void complete_io(unsigned long error, void *context) ...@@ -342,16 +345,20 @@ static void complete_io(unsigned long error, void *context)
static int run_io_job(struct kcopyd_job *job) static int run_io_job(struct kcopyd_job *job)
{ {
int r; int r;
struct dm_io_request io_req = {
.bi_rw = job->rw,
.mem.type = DM_IO_PAGE_LIST,
.mem.ptr.pl = job->pages,
.mem.offset = job->offset,
.notify.fn = complete_io,
.notify.context = job,
.client = job->kc->io_client,
};
if (job->rw == READ) if (job->rw == READ)
r = dm_io_async(1, &job->source, job->rw, r = dm_io(&io_req, 1, &job->source, NULL);
job->pages,
job->offset, complete_io, job);
else else
r = dm_io_async(job->num_dests, job->dests, job->rw, r = dm_io(&io_req, job->num_dests, job->dests, NULL);
job->pages,
job->offset, complete_io, job);
return r; return r;
} }
...@@ -670,8 +677,9 @@ int kcopyd_client_create(unsigned int nr_pages, struct kcopyd_client **result) ...@@ -670,8 +677,9 @@ int kcopyd_client_create(unsigned int nr_pages, struct kcopyd_client **result)
return r; return r;
} }
r = dm_io_get(nr_pages); kc->io_client = dm_io_client_create(nr_pages);
if (r) { if (IS_ERR(kc->io_client)) {
r = PTR_ERR(kc->io_client);
client_free_pages(kc); client_free_pages(kc);
kfree(kc); kfree(kc);
kcopyd_exit(); kcopyd_exit();
...@@ -691,7 +699,7 @@ void kcopyd_client_destroy(struct kcopyd_client *kc) ...@@ -691,7 +699,7 @@ void kcopyd_client_destroy(struct kcopyd_client *kc)
/* Wait for completion of all jobs submitted by this client. */ /* Wait for completion of all jobs submitted by this client. */
wait_event(kc->destroyq, !atomic_read(&kc->nr_jobs)); wait_event(kc->destroyq, !atomic_read(&kc->nr_jobs));
dm_io_put(kc->nr_pages); dm_io_client_destroy(kc->io_client);
client_free_pages(kc); client_free_pages(kc);
client_del(kc); client_del(kc);
kfree(kc); kfree(kc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment