xfs: disable deprecated features by default in Kconfig

We promised to turn off these old features by default in September 2025.
Do so now.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

diff --git a/Documentation/admin-guide/xfs.rst b/Documentation/admin-guide/xfs.rst
index a18328a5fb93be33b943b9941bfba6fa09c745cd..693b09ca62922f184cea951fb08c6f0a6229ae6c 100644 (file)
--- a/Documentation/admin-guide/xfs.rst
+++ b/Documentation/admin-guide/xfs.rst
@@ -253,9 +253,8 @@ latest version and try again.
 
 The deprecation will take place in two parts.  Support for mounting V4
 filesystems can now be disabled at kernel build time via Kconfig option.
-The option will default to yes until September 2025, at which time it
-will be changed to default to no.  In September 2030, support will be
-removed from the codebase entirely.
+These options were changed to default to no in September 2025.  In
+September 2030, support will be removed from the codebase entirely.
 
 Note: Distributors may choose to withdraw V4 format support earlier than
 the dates listed above.

diff --git a/fs/xfs/Kconfig b/fs/xfs/Kconfig
index 065953475cf5eb03be532654b748ac9f104f048c..ecebd3ebab1342d573a2052248ff018aa2038a51 100644 (file)
--- a/fs/xfs/Kconfig
+++ b/fs/xfs/Kconfig
@@ -25,7 +25,7 @@ config XFS_FS
 config XFS_SUPPORT_V4
        bool "Support deprecated V4 (crc=0) format"
        depends on XFS_FS
-       default y
+       default n
        help
          The V4 filesystem format lacks certain features that are supported
          by the V5 format, such as metadata checksumming, strengthened
@@ -40,7 +40,7 @@ config XFS_SUPPORT_V4
          filesystem is a V4 filesystem.  If no such string is found, please
          upgrade xfsprogs to the latest version and try again.
 
-         This option will become default N in September 2025.  Support for the
+         This option became default N in September 2025.  Support for the
          V4 format will be removed entirely in September 2030.  Distributors
          can say N here to withdraw support earlier.
 
@@ -50,7 +50,7 @@ config XFS_SUPPORT_V4
 config XFS_SUPPORT_ASCII_CI
        bool "Support deprecated case-insensitive ascii (ascii-ci=1) format"
        depends on XFS_FS
-       default y
+       default n
        help
          The ASCII case insensitivity filesystem feature only works correctly
          on systems that have been coerced into using ISO 8859-1, and it does
@@ -67,7 +67,7 @@ config XFS_SUPPORT_ASCII_CI
          filesystem is a case-insensitive filesystem.  If no such string is
          found, please upgrade xfsprogs to the latest version and try again.
 
-         This option will become default N in September 2025.  Support for the
+         This option became default N in September 2025.  Support for the
          feature will be removed entirely in September 2030.  Distributors
          can say N here to withdraw support earlier.