From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Apr 2021 22:17:08 +0000 (-0700)
Subject: Merge tag 'ovl-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d652502ef46895820533aada50ddfd94abe078fe;p=linux.git

Merge tag 'ovl-update-5.13' of git://git./linux/kernel/git/mszeredi/vfs

Pull overlayfs update from Miklos Szeredi:

 - Fix a regression introduced in 5.2 that resulted in valid overlayfs
   mounts being rejected with ELOOP (Too many levels of symbolic links)

 - Fix bugs found by various tools

 - Miscellaneous improvements and cleanups

* tag 'ovl-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: add debug print to ovl_do_getxattr()
  ovl: invalidate readdir cache on changes to dir with origin
  ovl: allow upperdir inside lowerdir
  ovl: show "userxattr" in the mount data
  ovl: trivial typo fixes in the file inode.c
  ovl: fix misspellings using codespell tool
  ovl: do not copy attr several times
  ovl: remove ovl_map_dev_ino() return value
  ovl: fix error for ovl_fill_super()
  ovl: fix missing revert_creds() on error path
  ovl: fix leaked dentry
  ovl: restrict lower null uuid for "xino=auto"
  ovl: check that upperdir path is not on a read-only mount
  ovl: plumb through flush method
---

d652502ef46895820533aada50ddfd94abe078fe
diff --cc fs/overlayfs/file.c
index c144183a7e096,6e454a2940469..4d53d3b7e5fe1
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@@ -581,6 -716,11 +601,7 @@@ const struct file_operations ovl_file_o
  	.mmap		= ovl_mmap,
  	.fallocate	= ovl_fallocate,
  	.fadvise	= ovl_fadvise,
 -	.unlocked_ioctl	= ovl_ioctl,
+ 	.flush		= ovl_flush,
 -#ifdef CONFIG_COMPAT
 -	.compat_ioctl	= ovl_compat_ioctl,
 -#endif
  	.splice_read    = generic_file_splice_read,
  	.splice_write   = iter_file_splice_write,