Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[linux-2.6-block.git] / drivers / target / target_core_iblock.c

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 60429011292a2c4c2fa4104a90414ae948f956a7..ce1321a5cb7bfe28320baf0fe64641eae1477f6a 100644 (file)
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -94,8 +94,8 @@ static int iblock_configure_device(struct se_device *dev)
                return -EINVAL;
        }
 
-       ib_dev->ibd_bio_set = bioset_create(IBLOCK_BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);
-       if (!ib_dev->ibd_bio_set) {
+       ret = bioset_init(&ib_dev->ibd_bio_set, IBLOCK_BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);
+       if (ret) {
                pr_err("IBLOCK: Unable to create bioset\n");
                goto out;
        }
@@ -141,7 +141,7 @@ static int iblock_configure_device(struct se_device *dev)
 
        bi = bdev_get_integrity(bd);
        if (bi) {
-               struct bio_set *bs = ib_dev->ibd_bio_set;
+               struct bio_set *bs = &ib_dev->ibd_bio_set;
 
                if (!strcmp(bi->profile->name, "T10-DIF-TYPE3-IP") ||
                    !strcmp(bi->profile->name, "T10-DIF-TYPE1-IP")) {
@@ -164,7 +164,7 @@ static int iblock_configure_device(struct se_device *dev)
                                goto out_blkdev_put;
                        }
                        pr_debug("IBLOCK setup BIP bs->bio_integrity_pool: %p\n",
-                                bs->bio_integrity_pool);
+                                &bs->bio_integrity_pool);
                }
                dev->dev_attrib.hw_pi_prot_type = dev->dev_attrib.pi_prot_type;
        }
@@ -174,8 +174,7 @@ static int iblock_configure_device(struct se_device *dev)
 out_blkdev_put:
        blkdev_put(ib_dev->ibd_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
 out_free_bioset:
-       bioset_free(ib_dev->ibd_bio_set);
-       ib_dev->ibd_bio_set = NULL;
+       bioset_exit(&ib_dev->ibd_bio_set);
 out:
        return ret;
 }
@@ -199,8 +198,7 @@ static void iblock_destroy_device(struct se_device *dev)
 
        if (ib_dev->ibd_bd != NULL)
                blkdev_put(ib_dev->ibd_bd, FMODE_WRITE|FMODE_READ|FMODE_EXCL);
-       if (ib_dev->ibd_bio_set != NULL)
-               bioset_free(ib_dev->ibd_bio_set);
+       bioset_exit(&ib_dev->ibd_bio_set);
 }
 
 static unsigned long long iblock_emulate_read_cap_with_block_size(
@@ -332,7 +330,7 @@ iblock_get_bio(struct se_cmd *cmd, sector_t lba, u32 sg_num, int op,
        if (sg_num > BIO_MAX_PAGES)
                sg_num = BIO_MAX_PAGES;
 
-       bio = bio_alloc_bioset(GFP_NOIO, sg_num, ib_dev->ibd_bio_set);
+       bio = bio_alloc_bioset(GFP_NOIO, sg_num, &ib_dev->ibd_bio_set);
        if (!bio) {
                pr_err("Unable to allocate memory for bio\n");
                return NULL;