Merge tag 'ovl-update-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs

Pull overlayfs updates from Amir Goldstein:

 - add verification feature needed by composefs (Alexander Larsson)

 - improve integration of overlayfs and fanotify (Amir Goldstein)

 - fortify some overlayfs code (Andrea Righi)

* tag 'ovl-update-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs:
  ovl: validate superblock in OVL_FS()
  ovl: make consistent use of OVL_FS()
  ovl: Kconfig: introduce CONFIG_OVERLAY_FS_DEBUG
  ovl: auto generate uuid for new overlay filesystems
  ovl: store persistent uuid/fsid with uuid=on
  ovl: add support for unique fsid per instance
  ovl: support encoding non-decodable file handles
  ovl: Handle verity during copy-up
  ovl: Validate verity xattr when resolving lowerdata
  ovl: Add versioned header for overlay.metacopy xattr
  ovl: Add framework for verity support

diff --cc fs/overlayfs/file.c
Simple merge

diff --cc fs/overlayfs/inode.c
index f22e27b7802564657cd565e595bc52093231f57d,b395cd84bfce7c8006481eec7b614ba9e1042a65..83ef66644c213be0ac270a8bf5c2639a5545d618
--- 1/fs/overlayfs/inode.c
--- 2/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@@ -693,10 -693,10 +693,10 @@@ int ovl_set_acl(struct mnt_idmap *idmap
  }
  #endif
  
 -int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags)
 +int ovl_update_time(struct inode *inode, int flags)
  {
        if (flags & S_ATIME) {
-               struct ovl_fs *ofs = inode->i_sb->s_fs_info;
+               struct ovl_fs *ofs = OVL_FS(inode->i_sb);
                struct path upperpath = {
                        .mnt = ovl_upper_mnt(ofs),
                        .dentry = ovl_upperdentry_dereference(OVL_I(inode)),

diff --cc fs/overlayfs/overlayfs.h
Simple merge

diff --cc fs/overlayfs/util.c
Simple merge