From: Peter Georg <peter.georg(a)physik.uni-regensburg.de>
[fs] dax: Add ifdef RHEL_DIFFERENCES
Bugzilla:
http://bugzilla.redhat.com/1995338
Upstream Status: RHEL only
Fixes: 01b34c7056601
Signed-off-by: Peter Georg <peter.georg(a)physik.uni-regensburg.de>
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index blahblah..blahblah 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4760,7 +4760,6 @@ static int __ext4_fill_super(struct fs_context *fc, struct
super_block *sb)
}
if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) {
- static bool printed = false;
if (ext4_has_feature_inline_data(sb)) {
ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem"
" that may contain inline data");
@@ -4771,10 +4770,14 @@ static int __ext4_fill_super(struct fs_context *fc, struct
super_block *sb)
"DAX unsupported by block device.");
goto failed_mount;
}
+
+#ifdef CONFIG_RHEL_DIFFERENCES
+ static bool printed = false;
if (!printed) {
mark_tech_preview("ext4 direct access (dax)", NULL);
printed = true;
}
+#endif
}
if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) {
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index blahblah..blahblah 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1602,14 +1602,17 @@ xfs_fs_fill_super(
sb->s_flags |= SB_I_VERSION;
if (xfs_has_dax_always(mp)) {
- static bool printed = false;
error = xfs_setup_dax_always(mp);
if (error)
goto out_filestream_unmount;
+
+#ifdef CONFIG_RHEL_DIFFERENCES
+ static bool printed = false;
if (!printed) {
mark_tech_preview("xfs direct access (dax)", NULL);
printed = true;
}
+#endif
}
if (xfs_has_discard(mp)) {
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610