Commit d74b15db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libnvdimm-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm 

Pull libnvdimm updates from Dan Williams:
 "Small collection of cleanups to rework usage of ->queuedata and the
  GUID api"

* tag 'libnvdimm-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  nvdimm/pmem: stop using ->queuedata
  nvdimm/btt: stop using ->queuedata
  nvdimm/blk: stop using ->queuedata
  libnvdimm: Replace guid_copy() with import_guid() where it makes sense
parents 298ce0fd 6ec26b8b

drivers/acpi/nfit/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2293,7 +2293,7 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc, 
	nd_set = devm_kzalloc(dev, sizeof(*nd_set), GFP_KERNEL);

	if (!nd_set)

		return -ENOMEM;

	guid_copy(&nd_set->type_guid, (guid_t *) spa->range_guid);

	import_guid(&nd_set->type_guid, spa->range_guid);



	info = devm_kzalloc(dev, sizeof_nfit_set_info(nr), GFP_KERNEL);

	if (!info)

drivers/nvdimm/blk.c

+2 −3
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int nsblk_do_bvec(struct nd_namespace_blk *nsblk, 
static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio)

{

	struct bio_integrity_payload *bip;

	struct nd_namespace_blk *nsblk;

	struct nd_namespace_blk *nsblk = bio->bi_disk->private_data;

	struct bvec_iter iter;

	unsigned long start;

	struct bio_vec bvec;
@@ -176,7 +176,6 @@ static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio) 
		return BLK_QC_T_NONE;



	bip = bio_integrity(bio);

	nsblk = q->queuedata;

	rw = bio_data_dir(bio);

	do_acct = blk_queue_io_stat(bio->bi_disk->queue);

	if (do_acct)
@@ -260,7 +259,6 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk) 
	blk_queue_max_hw_sectors(q, UINT_MAX);

	blk_queue_logical_block_size(q, nsblk_sector_size(nsblk));

	blk_queue_flag_set(QUEUE_FLAG_NONROT, q);

	q->queuedata = nsblk;



	disk = alloc_disk(0);

	if (!disk)
@@ -270,6 +268,7 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk) 
	disk->fops		= &nd_blk_fops;

	disk->queue		= q;

	disk->flags		= GENHD_FL_EXT_DEVT;

	disk->private_data	= nsblk;

	nvdimm_namespace_disk_name(&nsblk->common, disk->disk_name);



	if (devm_add_action_or_reset(dev, nd_blk_release_disk, disk))

drivers/nvdimm/btt.c

+1 −2
Original line number Diff line number Diff line
@@ -1442,7 +1442,7 @@ static int btt_do_bvec(struct btt *btt, struct bio_integrity_payload *bip, 
static blk_qc_t btt_make_request(struct request_queue *q, struct bio *bio)

{

	struct bio_integrity_payload *bip = bio_integrity(bio);

	struct btt *btt = q->queuedata;

	struct btt *btt = bio->bi_disk->private_data;

	struct bvec_iter iter;

	unsigned long start;

	struct bio_vec bvec;
@@ -1545,7 +1545,6 @@ static int btt_blk_init(struct btt *btt) 
	blk_queue_logical_block_size(btt->btt_queue, btt->sector_size);

	blk_queue_max_hw_sectors(btt->btt_queue, UINT_MAX);

	blk_queue_flag_set(QUEUE_FLAG_NONROT, btt->btt_queue);

	btt->btt_queue->queuedata = btt;



	if (btt_meta_size(btt)) {

		int rc = nd_integrity_init(btt->btt_disk, btt_meta_size(btt));

drivers/nvdimm/pmem.c

+3 −3
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio) 
	unsigned long start;

	struct bio_vec bvec;

	struct bvec_iter iter;

	struct pmem_device *pmem = q->queuedata;

	struct pmem_device *pmem = bio->bi_disk->private_data;

	struct nd_region *nd_region = to_region(pmem);



	if (bio->bi_opf & REQ_PREFLUSH)
@@ -234,7 +234,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio) 
static int pmem_rw_page(struct block_device *bdev, sector_t sector,

		       struct page *page, unsigned int op)

{

	struct pmem_device *pmem = bdev->bd_queue->queuedata;

	struct pmem_device *pmem = bdev->bd_disk->private_data;

	blk_status_t rc;



	if (op_is_write(op))
@@ -467,7 +467,6 @@ static int pmem_attach_disk(struct device *dev, 
	blk_queue_flag_set(QUEUE_FLAG_NONROT, q);

	if (pmem->pfn_flags & PFN_MAP)

		blk_queue_flag_set(QUEUE_FLAG_DAX, q);

	q->queuedata = pmem;



	disk = alloc_disk_node(0, nid);

	if (!disk)
@@ -477,6 +476,7 @@ static int pmem_attach_disk(struct device *dev, 
	disk->fops		= &pmem_fops;

	disk->queue		= q;

	disk->flags		= GENHD_FL_EXT_DEVT;

	disk->private_data	= pmem;

	disk->queue->backing_dev_info->capabilities |= BDI_CAP_SYNCHRONOUS_IO;

	nvdimm_namespace_disk_name(ndns, disk->disk_name);

	set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset)