From: Dan Williams <dan.j.williams@intel.com>
Date: Mon, 3 Jul 2017 23:54:58 +0000 (-0700)
Subject: Merge branch 'for-4.13/dax' into libnvdimm-for-next
X-Git-Tag: v4.13-rc1~120^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9d92573fff3ec70785ef1815cc80573f70e7a921;p=linux.git

Merge branch 'for-4.13/dax' into libnvdimm-for-next
---

9d92573fff3ec70785ef1815cc80573f70e7a921
diff --cc drivers/nvdimm/pmem.c
index 4a9cffc14512,e7a40f77f729..e0f6d83c5a6e
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@@ -68,11 -68,9 +68,11 @@@ static int pmem_clear_poison(struct pme
  				(unsigned long long) sector, cleared,
  				cleared > 1 ? "s" : "");
  		badblocks_clear(&pmem->bb, sector, cleared);
 +		if (pmem->bb_state)
 +			sysfs_notify_dirent(pmem->bb_state);
  	}
  
- 	invalidate_pmem(pmem->virt_addr + offset, len);
+ 	arch_invalidate_pmem(pmem->virt_addr + offset, len);
  
  	return rc;
  }
@@@ -341,10 -363,9 +365,10 @@@ static int pmem_attach_disk(struct devi
  		return PTR_ERR(addr);
  	pmem->virt_addr = addr;
  
- 	blk_queue_write_cache(q, true, true);
+ 	blk_queue_write_cache(q, wbc, fua);
  	blk_queue_make_request(q, pmem_make_request);
  	blk_queue_physical_block_size(q, PAGE_SIZE);
 +	blk_queue_logical_block_size(q, pmem_sector_size(ndns));
  	blk_queue_max_hw_sectors(q, UINT_MAX);
  	blk_queue_bounce_limit(q, BLK_BOUNCE_ANY);
  	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);
diff --cc drivers/nvdimm/region_devs.c
index ab141f8b5140,0c3b089b280a..5954cfbea3fc
--- a/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@@ -307,9 -311,8 +311,9 @@@ static ssize_t set_cookie_show(struct d
  {
  	struct nd_region *nd_region = to_nd_region(dev);
  	struct nd_interleave_set *nd_set = nd_region->nd_set;
 +	ssize_t rc = 0;
  
- 	if (is_nd_pmem(dev) && nd_set)
+ 	if (is_memory(dev) && nd_set)
  		/* pass, should be precluded by region_visible */;
  	else
  		return -ENXIO;