From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Jun 2020 20:04:36 +0000 (-0700)
Subject: Merge tag 'libnvdimm-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d74b15dbbbd2741f3580d7c884cd285144ae0cab;p=linux.git

Merge tag 'libnvdimm-for-5.8' of git://git./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
---

d74b15dbbbd2741f3580d7c884cd285144ae0cab
diff --cc drivers/nvdimm/blk.c
index 036e23aef9b04,ffe4728bad8b1..39030a324d7ff
--- a/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@@ -176,11 -176,8 +176,10 @@@ static blk_qc_t nd_blk_make_request(str
  		return BLK_QC_T_NONE;
  
  	bip = bio_integrity(bio);
- 	nsblk = q->queuedata;
  	rw = bio_data_dir(bio);
 -	do_acct = nd_iostat_start(bio, &start);
 +	do_acct = blk_queue_io_stat(bio->bi_disk->queue);
 +	if (do_acct)
 +		start = bio_start_io_acct(bio);
  	bio_for_each_segment(bvec, bio, iter) {
  		unsigned int len = bvec.bv_len;