Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-microblaze.git] / drivers / md / raid5-cache.c

diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index e2564d8..e6e925a 100644 (file)
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -125,9 +125,9 @@ struct r5l_log {
        struct list_head no_mem_stripes;   /* pending stripes, -ENOMEM */
 
        struct kmem_cache *io_kc;
-       mempool_t *io_pool;
-       struct bio_set *bs;
-       mempool_t *meta_pool;
+       mempool_t io_pool;
+       struct bio_set bs;
+       mempool_t meta_pool;
 
        struct md_thread *reclaim_thread;
        unsigned long reclaim_target;   /* number of space that need to be
@@ -579,7 +579,7 @@ static void r5l_log_endio(struct bio *bio)
                md_error(log->rdev->mddev, log->rdev);
 
        bio_put(bio);
-       mempool_free(io->meta_page, log->meta_pool);
+       mempool_free(io->meta_page, &log->meta_pool);
 
        spin_lock_irqsave(&log->io_list_lock, flags);
        __r5l_set_io_unit_state(io, IO_UNIT_IO_END);
@@ -717,7 +717,6 @@ static void r5c_disable_writeback_async(struct work_struct *work)
 static void r5l_submit_current_io(struct r5l_log *log)
 {
        struct r5l_io_unit *io = log->current_io;
-       struct bio *bio;
        struct r5l_meta_block *block;
        unsigned long flags;
        u32 crc;
@@ -730,7 +729,6 @@ static void r5l_submit_current_io(struct r5l_log *log)
        block->meta_size = cpu_to_le32(io->meta_offset);
        crc = crc32c_le(log->uuid_checksum, block, PAGE_SIZE);
        block->checksum = cpu_to_le32(crc);
-       bio = io->current_bio;
 
        log->current_io = NULL;
        spin_lock_irqsave(&log->io_list_lock, flags);
@@ -748,7 +746,7 @@ static void r5l_submit_current_io(struct r5l_log *log)
 
 static struct bio *r5l_bio_alloc(struct r5l_log *log)
 {
-       struct bio *bio = bio_alloc_bioset(GFP_NOIO, BIO_MAX_PAGES, log->bs);
+       struct bio *bio = bio_alloc_bioset(GFP_NOIO, BIO_MAX_PAGES, &log->bs);
 
        bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
        bio_set_dev(bio, log->rdev->bdev);
@@ -780,7 +778,7 @@ static struct r5l_io_unit *r5l_new_meta(struct r5l_log *log)
        struct r5l_io_unit *io;
        struct r5l_meta_block *block;
 
-       io = mempool_alloc(log->io_pool, GFP_ATOMIC);
+       io = mempool_alloc(&log->io_pool, GFP_ATOMIC);
        if (!io)
                return NULL;
        memset(io, 0, sizeof(*io));
@@ -791,7 +789,7 @@ static struct r5l_io_unit *r5l_new_meta(struct r5l_log *log)
        bio_list_init(&io->flush_barriers);
        io->state = IO_UNIT_RUNNING;
 
-       io->meta_page = mempool_alloc(log->meta_pool, GFP_NOIO);
+       io->meta_page = mempool_alloc(&log->meta_pool, GFP_NOIO);
        block = page_address(io->meta_page);
        clear_page(block);
        block->magic = cpu_to_le32(R5LOG_MAGIC);
@@ -1223,7 +1221,7 @@ static bool r5l_complete_finished_ios(struct r5l_log *log)
                log->next_checkpoint = io->log_start;
 
                list_del(&io->log_sibling);
-               mempool_free(io, log->io_pool);
+               mempool_free(io, &log->io_pool);
                r5l_run_no_mem_stripe(log);
 
                found = true;
@@ -1647,7 +1645,7 @@ static int r5l_recovery_allocate_ra_pool(struct r5l_log *log,
 {
        struct page *page;
 
-       ctx->ra_bio = bio_alloc_bioset(GFP_KERNEL, BIO_MAX_PAGES, log->bs);
+       ctx->ra_bio = bio_alloc_bioset(GFP_KERNEL, BIO_MAX_PAGES, &log->bs);
        if (!ctx->ra_bio)
                return -ENOMEM;
 
@@ -3066,6 +3064,7 @@ int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
        struct request_queue *q = bdev_get_queue(rdev->bdev);
        struct r5l_log *log;
        char b[BDEVNAME_SIZE];
+       int ret;
 
        pr_debug("md/raid:%s: using device %s as journal\n",
                 mdname(conf->mddev), bdevname(rdev->bdev, b));
@@ -3111,16 +3110,16 @@ int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
        if (!log->io_kc)
                goto io_kc;
 
-       log->io_pool = mempool_create_slab_pool(R5L_POOL_SIZE, log->io_kc);
-       if (!log->io_pool)
+       ret = mempool_init_slab_pool(&log->io_pool, R5L_POOL_SIZE, log->io_kc);
+       if (ret)
                goto io_pool;
 
-       log->bs = bioset_create(R5L_POOL_SIZE, 0, BIOSET_NEED_BVECS);
-       if (!log->bs)
+       ret = bioset_init(&log->bs, R5L_POOL_SIZE, 0, BIOSET_NEED_BVECS);
+       if (ret)
                goto io_bs;
 
-       log->meta_pool = mempool_create_page_pool(R5L_POOL_SIZE, 0);
-       if (!log->meta_pool)
+       ret = mempool_init_page_pool(&log->meta_pool, R5L_POOL_SIZE, 0);
+       if (ret)
                goto out_mempool;
 
        spin_lock_init(&log->tree_lock);
@@ -3155,11 +3154,11 @@ int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
        rcu_assign_pointer(conf->log, NULL);
        md_unregister_thread(&log->reclaim_thread);
 reclaim_thread:
-       mempool_destroy(log->meta_pool);
+       mempool_exit(&log->meta_pool);
 out_mempool:
-       bioset_free(log->bs);
+       bioset_exit(&log->bs);
 io_bs:
-       mempool_destroy(log->io_pool);
+       mempool_exit(&log->io_pool);
 io_pool:
        kmem_cache_destroy(log->io_kc);
 io_kc:
@@ -3178,9 +3177,9 @@ void r5l_exit_log(struct r5conf *conf)
        wake_up(&conf->mddev->sb_wait);
        flush_work(&log->disable_writeback_work);
        md_unregister_thread(&log->reclaim_thread);
-       mempool_destroy(log->meta_pool);
-       bioset_free(log->bs);
-       mempool_destroy(log->io_pool);
+       mempool_exit(&log->meta_pool);
+       bioset_exit(&log->bs);
+       mempool_exit(&log->io_pool);
        kmem_cache_destroy(log->io_kc);
        kfree(log);
 }