Commit 56c455b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-6.4-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs updates from Dave Chinner:
 "This consists mainly of online scrub functionality and the design
  documentation for the upcoming online repair functionality built on
  top of the scrub code:

   - Added detailed design documentation for the upcoming online repair
     feature

   - major update to online scrub to complete the reverse mapping
     cross-referencing infrastructure enabling us to fully validate
     allocated metadata against owner records. This is the last piece of
     scrub infrastructure needed before we can start merging online
     repair functionality.

   - Fixes for the ascii-ci hashing issues

   - deprecation of the ascii-ci functionality

   - on-disk format verification bug fixes

   - various random bug fixes for syzbot and other bug reports"

* tag 'xfs-6.4-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (107 commits)
  xfs: fix livelock in delayed allocation at ENOSPC
  xfs: Extend table marker on deprecated mount options table
  xfs: fix duplicate includes
  xfs: fix BUG_ON in xfs_getbmap()
  xfs: verify buffer contents when we skip log replay
  xfs: _{attr,data}_map_shared should take ILOCK_EXCL until iread_extents is completely done
  xfs: remove WARN when dquot cache insertion fails
  xfs: don't consider future format versions valid
  xfs: deprecate the ascii-ci feature
  xfs: test the ascii case-insensitive hash
  xfs: stabilize the dirent name transformation function used for ascii-ci dir hash computation
  xfs: cross-reference rmap records with refcount btrees
  xfs: cross-reference rmap records with inode btrees
  xfs: cross-reference rmap records with free space btrees
  xfs: cross-reference rmap records with ag btrees
  xfs: introduce bitmap type for AG blocks
  xfs: convert xbitmap to interval tree
  xfs: drop the _safe behavior from the xbitmap foreach macro
  xfs: don't load local xattr values during scrub
  xfs: remove the for_each_xbitmap_ helpers
  ...
parents bedf1495 9419092f

Documentation/admin-guide/xfs.rst

+4 −3
Original line number Diff line number Diff line
@@ -236,13 +236,14 @@ the dates listed above. 
Deprecated Mount Options

========================



===========================     ================

============================    ================

  Name				Removal Schedule

===========================     ================

============================    ================

Mounting with V4 filesystem     September 2030

Mounting ascii-ci filesystem    September 2030

ikeep/noikeep			September 2025

attr2/noattr2			September 2025

===========================     ================

============================    ================





Removed Mount Options

Documentation/filesystems/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -123,4 +123,5 @@ Documentation for filesystem implementations. 
   vfat

   xfs-delayed-logging-design

   xfs-self-describing-metadata

   xfs-online-fsck-design

   zonefs

Documentation/filesystems/xfs-online-fsck-design.rst

0 → 100644
+5315 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/filesystems/xfs-self-describing-metadata.rst

+1 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0

.. _xfs_self_describing_metadata:



============================

XFS Self Describing Metadata

fs/xfs/Kconfig

+32 −0
Original line number Diff line number Diff line
@@ -47,6 +47,33 @@ config XFS_SUPPORT_V4 
	  To continue supporting the old V4 format (crc=0), say Y.

	  To close off an attack surface, say N.



config XFS_SUPPORT_ASCII_CI

	bool "Support deprecated case-insensitive ascii (ascii-ci=1) format"

	depends on XFS_FS

	default y

	help

	  The ASCII case insensitivity filesystem feature only works correctly

	  on systems that have been coerced into using ISO 8859-1, and it does

	  not work on extended attributes.  The kernel has no visibility into

	  the locale settings in userspace, so it corrupts UTF-8 names.

	  Enabling this feature makes XFS vulnerable to mixed case sensitivity

	  attacks.  Because of this, the feature is deprecated.  All users

	  should upgrade by backing up their files, reformatting, and restoring

	  from the backup.



	  Administrators and users can detect such a filesystem by running

	  xfs_info against a filesystem mountpoint and checking for a string

	  beginning with "ascii-ci=".  If the string "ascii-ci=1" is found, the

	  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

	  feature will be removed entirely in September 2030.  Distributors

	  can say N here to withdraw support earlier.



	  To continue supporting case-insensitivity (ascii-ci=1), say Y.

	  To close off an attack surface, say N.



config XFS_QUOTA

	bool "XFS Quota support"

	depends on XFS_FS
@@ -93,10 +120,15 @@ config XFS_RT 


	  If unsure, say N.



config XFS_DRAIN_INTENTS

	bool

	select JUMP_LABEL if HAVE_ARCH_JUMP_LABEL



config XFS_ONLINE_SCRUB

	bool "XFS online metadata check support"

	default n

	depends on XFS_FS

	select XFS_DRAIN_INTENTS

	help

	  If you say Y here you will be able to check metadata on a

	  mounted XFS filesystem.  This feature is intended to reduce