[POWERPC] Add spinlock to request_phb_iospace()

[safe/jmp/linux-2.6] / drivers / md / kcopyd.c

diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index 73ab875..dbc234e 100644 (file)
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2002 Sistina Software (UK) Limited.
+ * Copyright (C) 2006 Red Hat GmbH
  *
  * This file is released under the GPL.
  *
@@ -12,7 +13,6 @@
 #include <asm/atomic.h>
 
 #include <linux/blkdev.h>
-#include <linux/config.h>
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/list.h>
@@ -46,6 +46,8 @@ struct kcopyd_client {
        unsigned int nr_pages;
        unsigned int nr_free_pages;
 
+       struct dm_io_client *io_client;
+
        wait_queue_head_t destroyq;
        atomic_t nr_jobs;
 };
@@ -204,7 +206,7 @@ struct kcopyd_job {
 /* FIXME: this should scale with the number of pages */
 #define MIN_JOBS 512
 
-static kmem_cache_t *_job_cache;
+static struct kmem_cache *_job_cache;
 static mempool_t *_job_pool;
 
 /*
@@ -343,16 +345,20 @@ static void complete_io(unsigned long error, void *context)
 static int run_io_job(struct kcopyd_job *job)
 {
        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)
-               r = dm_io_async(1, &job->source, job->rw,
-                               job->pages,
-                               job->offset, complete_io, job);
-
+               r = dm_io(&io_req, 1, &job->source, NULL);
        else
-               r = dm_io_async(job->num_dests, job->dests, job->rw,
-                               job->pages,
-                               job->offset, complete_io, job);
+               r = dm_io(&io_req, job->num_dests, job->dests, NULL);
 
        return r;
 }
@@ -418,7 +424,7 @@ static int process_jobs(struct list_head *jobs, int (*fn) (struct kcopyd_job *))
 /*
  * kcopyd does this every time it's woken up.
  */
-static void do_work(void *ignored)
+static void do_work(struct work_struct *ignored)
 {
        /*
         * The order that these are called is *very* important.
@@ -629,7 +635,7 @@ static int kcopyd_init(void)
        }
 
        kcopyd_clients++;
-       INIT_WORK(&_kcopyd_work, do_work, NULL);
+       INIT_WORK(&_kcopyd_work, do_work);
        mutex_unlock(&kcopyd_init_lock);
        return 0;
 }
@@ -671,8 +677,9 @@ int kcopyd_client_create(unsigned int nr_pages, struct kcopyd_client **result)
                return r;
        }
 
-       r = dm_io_get(nr_pages);
-       if (r) {
+       kc->io_client = dm_io_client_create(nr_pages);
+       if (IS_ERR(kc->io_client)) {
+               r = PTR_ERR(kc->io_client);
                client_free_pages(kc);
                kfree(kc);
                kcopyd_exit();
@@ -692,7 +699,7 @@ void kcopyd_client_destroy(struct kcopyd_client *kc)
        /* Wait for completion of all jobs submitted by this client. */
        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_del(kc);
        kfree(kc);