Merge branch 'work.dcache' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / md / dm-core.h

diff --git a/drivers/md/dm-core.h b/drivers/md/dm-core.h
index 6a14f94..3222e21 100644 (file)
--- a/drivers/md/dm-core.h
+++ b/drivers/md/dm-core.h
@@ -91,8 +91,7 @@ struct mapped_device {
        /*
         * io objects are allocated from here.
         */
-       mempool_t *io_pool;
-
+       struct bio_set *io_bs;
        struct bio_set *bs;
 
        /*
@@ -130,8 +129,6 @@ struct mapped_device {
        struct srcu_struct io_barrier;
 };
 
-void dm_init_md_queue(struct mapped_device *md);
-void dm_init_normal_md_queue(struct mapped_device *md);
 int md_in_flight(struct mapped_device *md);
 void disable_write_same(struct mapped_device *md);
 void disable_write_zeroes(struct mapped_device *md);