4.17-stable review patch. If anyone has any objections, please let me know.
------------------ From: Ross Zwisler <[email protected]> commit 4557641b4c7046625c026fb809c47ef0d43ae595 upstream. QUEUE_FLAG_DAX is an indication that a given block device supports filesystem DAX and should not be set for PMEM namespaces which are in "raw" mode. These namespaces lack struct page and are prevented from participating in filesystem DAX as of commit 569d0365f571 ("dax: require 'struct page' by default for filesystem dax"). Signed-off-by: Ross Zwisler <[email protected]> Suggested-by: Mike Snitzer <[email protected]> Fixes: 569d0365f571 ("dax: require 'struct page' by default for filesystem dax") Cc: [email protected] Acked-by: Dan Williams <[email protected]> Reviewed-by: Toshi Kani <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/nvdimm/pmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -387,7 +387,8 @@ static int pmem_attach_disk(struct devic blk_queue_logical_block_size(q, pmem_sector_size(ndns)); blk_queue_max_hw_sectors(q, UINT_MAX); blk_queue_flag_set(QUEUE_FLAG_NONROT, q); - blk_queue_flag_set(QUEUE_FLAG_DAX, q); + if (pmem->pfn_flags & PFN_MAP) + blk_queue_flag_set(QUEUE_FLAG_DAX, q); q->queuedata = pmem; disk = alloc_disk_node(0, nid);
