target: convert to bioset_init()/mempool_init() (a47a28b7) · Commits · 戴 / test

drivers/target/target_core_iblock.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -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")) {
		@@ -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;

drivers/target/target_core_iblock.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ struct iblock_dev {
		struct se_device dev;
		unsigned char ibd_udev_path[SE_UDEV_PATH_LEN];
		u32 ibd_flags;
		struct bio_set *ibd_bio_set;
		struct bio_set ibd_bio_set;
		struct block_device *ibd_bd;
		bool ibd_readonly;
		} ____cacheline_aligned;

Admin message