[PATCH 1/3] dax: fix S_DAX definition

[Dan Williams]

Make sure S_DAX is defined in the CONFIG_FS_DAX=n + CONFIG_DEV_DAX=y
case. Otherwise vma_is_dax() may incorrectly return false in the
Device-DAX case.

Cc: Alexander Viro 
Cc: linux-fsde...@vger.kernel.org
Cc: Christoph Hellwig 
Cc: Jan Kara 
Cc: 
Fixes: dee410792419 ("/dev/dax, core: file operations and dax-mmap")
Signed-off-by: Dan Williams 
---
 include/linux/fs.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 511fbaabf624..a3329258ff5c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1850,7 +1850,7 @@ struct super_operations {
 #define S_IMA  1024/* Inode has an associated IMA struct */
 #define S_AUTOMOUNT2048/* Automount/referral quasi-directory */
 #define S_NOSEC4096/* no suid or xattr security attributes 
*/
-#ifdef CONFIG_FS_DAX
+#if IS_ENABLED(CONFIG_FS_DAX) || IS_ENABLED(CONFIG_DEV_DAX)
 #define S_DAX  8192/* Direct Access, avoiding the page cache */
 #else
 #define S_DAX  0   /* Make all the DAX code disappear */

[PATCH 1/3] dax: fix S_DAX definition

[Dan Williams]

Make sure S_DAX is defined in the CONFIG_FS_DAX=n + CONFIG_DEV_DAX=y
case. Otherwise vma_is_dax() may incorrectly return false in the
Device-DAX case.

Cc: Alexander Viro 
Cc: linux-fsde...@vger.kernel.org
Cc: Christoph Hellwig 
Cc: Jan Kara 
Cc: 
Fixes: dee410792419 ("/dev/dax, core: file operations and dax-mmap")
Signed-off-by: Dan Williams 
---
 include/linux/fs.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 511fbaabf624..a3329258ff5c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1850,7 +1850,7 @@ struct super_operations {
 #define S_IMA  1024/* Inode has an associated IMA struct */
 #define S_AUTOMOUNT2048/* Automount/referral quasi-directory */
 #define S_NOSEC4096/* no suid or xattr security attributes 
*/
-#ifdef CONFIG_FS_DAX
+#if IS_ENABLED(CONFIG_FS_DAX) || IS_ENABLED(CONFIG_DEV_DAX)
 #define S_DAX  8192/* Direct Access, avoiding the page cache */
 #else
 #define S_DAX  0   /* Make all the DAX code disappear */