From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Aug 2023 18:54:09 +0000 (-0700)
Subject: Merge tag 'ovl-update-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=63580f669d7ff5aa5a1fa2e3994114770a491722;p=linux.git

Merge tag 'ovl-update-6.6' of git://git./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
---

63580f669d7ff5aa5a1fa2e3994114770a491722
diff --cc fs/overlayfs/inode.c
index f22e27b780256,b395cd84bfce7..83ef66644c213
--- a/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)),