Use dax_is_supported() to validate whether the architecture has
virtually aliased caches at mount time.

This is relevant for architectures which require a dynamic check
to validate whether they have virtually aliased data caches
(ARCH_HAS_CACHE_ALIASING_DYNAMIC=y).

Fixes: d92576f1167c ("dax: does not work correctly with virtual aliasing 
caches")
Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
Cc: Jan Kara <j...@suse.com>
Cc: linux-e...@vger.kernel.org
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: linux...@kvack.org
Cc: linux-a...@vger.kernel.org
Cc: Dan Williams <dan.j.willi...@intel.com>
Cc: Vishal Verma <vishal.l.ve...@intel.com>
Cc: Dave Jiang <dave.ji...@intel.com>
Cc: Matthew Wilcox <wi...@infradead.org>
Cc: nvd...@lists.linux.dev
Cc: linux-...@vger.kernel.org
---
 fs/ext2/super.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 01f9addc8b1f..0398e7a90eb6 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -585,13 +585,13 @@ static int parse_options(char *options, struct 
super_block *sb,
                        set_opt(opts->s_mount_opt, XIP);
                        fallthrough;
                case Opt_dax:
-#ifdef CONFIG_FS_DAX
-                       ext2_msg(sb, KERN_WARNING,
-               "DAX enabled. Warning: EXPERIMENTAL, use at your own risk");
-                       set_opt(opts->s_mount_opt, DAX);
-#else
-                       ext2_msg(sb, KERN_INFO, "dax option not supported");
-#endif
+                       if (dax_is_supported()) {
+                               ext2_msg(sb, KERN_WARNING,
+                                        "DAX enabled. Warning: EXPERIMENTAL, 
use at your own risk");
+                               set_opt(opts->s_mount_opt, DAX);
+                       } else {
+                               ext2_msg(sb, KERN_INFO, "dax option not 
supported");
+                       }
                        break;
 
 #if defined(CONFIG_QUOTA)
-- 
2.39.2


Reply via email to