Commit 13d88ac54ddd for kernel

commit 13d88ac54ddd1011b6e94443958e798aa06eb835
Merge: 062cca8915ca 4ad714df58e6
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Nov 7 12:11:26 2023 -0800

    Merge tag 'vfs-6.7.fsid' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

    Pull vfs fanotify fsid updates from Christian Brauner:
     "This work is part of the plan to enable fanotify to serve as a drop-in
      replacement for inotify. While inotify is availabe on all filesystems,
      fanotify currently isn't.

      In order to support fanotify on all filesystems two things are needed:

       (1) all filesystems need to support AT_HANDLE_FID

       (2) all filesystems need to report a non-zero f_fsid

      This contains (1) and allows filesystems to encode non-decodable file
      handlers for fanotify without implementing any exportfs operations by
      encoding a file id of type FILEID_INO64_GEN from i_ino and
      i_generation.

      Filesystems that want to opt out of encoding non-decodable file ids
      for fanotify that don't support NFS export can do so by providing an
      empty export_operations struct.

      This also partially addresses (2) by generating f_fsid for simple
      filesystems as well as freevxfs. Remaining filesystems will be dealt
      with by separate patches.

      Finally, this contains the patch from the current exportfs maintainers
      which moves exportfs under vfs with Chuck, Jeff, and Amir as
      maintainers and vfs.git as tree"

    * tag 'vfs-6.7.fsid' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
      MAINTAINERS: create an entry for exportfs
      fs: fix build error with CONFIG_EXPORTFS=m or not defined
      freevxfs: derive f_fsid from bdev->bd_dev
      fs: report f_fsid from s_dev for "simple" filesystems
      exportfs: support encoding non-decodeable file handles by default
      exportfs: define FILEID_INO64_GEN* file handle types
      exportfs: make ->encode_fh() a mandatory method for NFS export
      exportfs: add helpers to check if filesystem can encode/decode file handles

diff --cc Documentation/filesystems/porting.rst
index d69f59700a23,9cc6cb27c4d5..878e72b2f8b7
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@@ -1050,5 -1050,7 +1050,14 @@@ kill_anon_super(), or kill_block_super(

  **mandatory**

 +Lock ordering has been changed so that s_umount ranks above open_mutex again.
 +All places where s_umount was taken under open_mutex have been fixed up.
++
++---
++
++**mandatory**
++
+ export_operations ->encode_fh() no longer has a default implementation to
+ encode FILEID_INO32_GEN* file handles.
+ Filesystems that used the default implementation may use the generic helper
+ generic_encode_ino32_fh() explicitly.
diff --cc MAINTAINERS
index 4127a8c79320,a194e6b0bcd1..79e0a307157f
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8156,15 -8051,18 +8156,27 @@@ F:	include/linux/fs_types.
  F:	include/uapi/linux/fs.h
  F:	include/uapi/linux/openat2.h

+ FILESYSTEMS [EXPORTFS]
+ M:	Chuck Lever <chuck.lever@oracle.com>
+ M:	Jeff Layton <jlayton@kernel.org>
+ R:	Amir Goldstein <amir73il@gmail.com>
+ L:	linux-fsdevel@vger.kernel.org
+ L:	linux-nfs@vger.kernel.org
+ S:	Supported
+ F:	Documentation/filesystems/nfs/exporting.rst
+ F:	fs/exportfs/
+ F:	fs/fhandle.c
+ F:	include/linux/exportfs.h
+
 +FILESYSTEMS [IOMAP]
 +M:	Christian Brauner <brauner@kernel.org>
 +R:	Darrick J. Wong <djwong@kernel.org>
 +L:	linux-xfs@vger.kernel.org
 +L:	linux-fsdevel@vger.kernel.org
 +S:	Supported
 +F:	fs/iomap/
 +F:	include/linux/iomap.h
 +
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:	Riku Voipio <riku.voipio@iki.fi>
  L:	linux-hwmon@vger.kernel.org