Commit d5240fa6 authored by Zhihao Cheng's avatar Zhihao Cheng Committed by Ira Weiny

nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases

The dax is only supported on pfn type pmem devices since commit
f467fee4 ("block: move the dax flag to queue_limits"). Trying
to mount DAX filesystem fails with this error:
 mount: : wrong fs type, bad option, bad superblock on /dev/pmem7,
          missing codepage or helper program, or other error.
 dmesg(1) may have more information after failed mount system call.
 dmesg: EXT4-fs (pmem7): DAX unsupported by block device.

Fix the problem by adding dax flag setting for the missed case.

Fixes: f467fee4 ("block: move the dax flag to queue_limits")
Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Tested-by: default avatarIra Weiny <ira.weiny@intel.com>
Tested-by: default avatarAlison Schofield <alison.schofield@intel.com>
Link: https://patch.msgid.link/20240809031155.2837271-1-chengzhihao1@huawei.comSigned-off-by: default avatarIra Weiny <ira.weiny@intel.com>
parent afdab700
...@@ -498,7 +498,7 @@ static int pmem_attach_disk(struct device *dev, ...@@ -498,7 +498,7 @@ static int pmem_attach_disk(struct device *dev,
} }
if (fua) if (fua)
lim.features |= BLK_FEAT_FUA; lim.features |= BLK_FEAT_FUA;
if (is_nd_pfn(dev)) if (is_nd_pfn(dev) || pmem_should_map_pages(dev))
lim.features |= BLK_FEAT_DAX; lim.features |= BLK_FEAT_DAX;
if (!devm_request_mem_region(dev, res->start, resource_size(res), if (!devm_request_mem_region(dev, res->start, resource_size(res),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment