Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-9
+1
-1
drivers/acpi/nfit/core.c
+1
-1
drivers/acpi/nfit/core.c
···
2293
2293
nd_set = devm_kzalloc(dev, sizeof(*nd_set), GFP_KERNEL);
2294
2294
if (!nd_set)
2295
2295
return -ENOMEM;
2296
-
guid_copy(&nd_set->type_guid, (guid_t *) spa->range_guid);
2296
+
import_guid(&nd_set->type_guid, spa->range_guid);
2297
2297
2298
2298
info = devm_kzalloc(dev, sizeof_nfit_set_info(nr), GFP_KERNEL);
2299
2299
if (!info)
+2
-3
drivers/nvdimm/blk.c
+2
-3
drivers/nvdimm/blk.c
···
165
165
static blk_qc_t nd_blk_make_request(struct request_queue *q, struct bio *bio)
166
166
{
167
167
struct bio_integrity_payload *bip;
168
-
struct nd_namespace_blk *nsblk;
168
+
struct nd_namespace_blk *nsblk = bio->bi_disk->private_data;
169
169
struct bvec_iter iter;
170
170
unsigned long start;
171
171
struct bio_vec bvec;
···
176
176
return BLK_QC_T_NONE;
177
177
178
178
bip = bio_integrity(bio);
179
-
nsblk = q->queuedata;
180
179
rw = bio_data_dir(bio);
181
180
do_acct = blk_queue_io_stat(bio->bi_disk->queue);
182
181
if (do_acct)
···
259
260
blk_queue_max_hw_sectors(q, UINT_MAX);
260
261
blk_queue_logical_block_size(q, nsblk_sector_size(nsblk));
261
262
blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
262
-
q->queuedata = nsblk;
263
263
264
264
disk = alloc_disk(0);
265
265
if (!disk)
···
268
270
disk->fops = &nd_blk_fops;
269
271
disk->queue = q;
270
272
disk->flags = GENHD_FL_EXT_DEVT;
273
+
disk->private_data = nsblk;
271
274
nvdimm_namespace_disk_name(&nsblk->common, disk->disk_name);
272
275
273
276
if (devm_add_action_or_reset(dev, nd_blk_release_disk, disk))
+1
-2
drivers/nvdimm/btt.c
+1
-2
drivers/nvdimm/btt.c
···
1442
1442
static blk_qc_t btt_make_request(struct request_queue *q, struct bio *bio)
1443
1443
{
1444
1444
struct bio_integrity_payload *bip = bio_integrity(bio);
1445
-
struct btt *btt = q->queuedata;
1445
+
struct btt *btt = bio->bi_disk->private_data;
1446
1446
struct bvec_iter iter;
1447
1447
unsigned long start;
1448
1448
struct bio_vec bvec;
···
1545
1545
blk_queue_logical_block_size(btt->btt_queue, btt->sector_size);
1546
1546
blk_queue_max_hw_sectors(btt->btt_queue, UINT_MAX);
1547
1547
blk_queue_flag_set(QUEUE_FLAG_NONROT, btt->btt_queue);
1548
-
btt->btt_queue->queuedata = btt;
1549
1548
1550
1549
if (btt_meta_size(btt)) {
1551
1550
int rc = nd_integrity_init(btt->btt_disk, btt_meta_size(btt));
+3
-3
drivers/nvdimm/pmem.c
+3
-3
drivers/nvdimm/pmem.c
···
197
197
unsigned long start;
198
198
struct bio_vec bvec;
199
199
struct bvec_iter iter;
200
-
struct pmem_device *pmem = q->queuedata;
200
+
struct pmem_device *pmem = bio->bi_disk->private_data;
201
201
struct nd_region *nd_region = to_region(pmem);
202
202
203
203
if (bio->bi_opf & REQ_PREFLUSH)
···
234
234
static int pmem_rw_page(struct block_device *bdev, sector_t sector,
235
235
struct page *page, unsigned int op)
236
236
{
237
-
struct pmem_device *pmem = bdev->bd_queue->queuedata;
237
+
struct pmem_device *pmem = bdev->bd_disk->private_data;
238
238
blk_status_t rc;
239
239
240
240
if (op_is_write(op))
···
467
467
blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
468
468
if (pmem->pfn_flags & PFN_MAP)
469
469
blk_queue_flag_set(QUEUE_FLAG_DAX, q);
470
-
q->queuedata = pmem;
471
470
472
471
disk = alloc_disk_node(0, nid);
473
472
if (!disk)
···
476
477
disk->fops = &pmem_fops;
477
478
disk->queue = q;
478
479
disk->flags = GENHD_FL_EXT_DEVT;
480
+
disk->private_data = pmem;
479
481
disk->queue->backing_dev_info->capabilities |= BDI_CAP_SYNCHRONOUS_IO;
480
482
nvdimm_namespace_disk_name(ndns, disk->disk_name);
481
483
set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset)