Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git tags/ovl-update-v2-6.16 - Fix a regression in getting the path of an open file (e.g. in /proc/PID/maps) for a nested overlayfs setup (André Almeida) - Support data-only layers and verity in a user namespace (unprivileged composefs use case) - Fix a gcc warning (Kees) - Cleanups Thanks, Miklos v2: dropped constification cleanup --- André Almeida (1): ovl: Fix nested backing file paths Kees Cook (1): ovl: Check for NULL d_inode() in ovl_dentry_upper() Miklos Szeredi (3): ovl: make redirect/metacopy rejection consistent ovl: relax redirect/metacopy requirements for lower -> data redirect ovl: don't require "metacopy=on" for "verity" Thorsten Blum (4): ovl: Use str_on_off() helper in ovl_show_options() ovl: Replace offsetof() with struct_size() in ovl_cache_entry_new() ovl: Replace offsetof() with struct_size() in ovl_stack_free() ovl: Annotate struct ovl_entry with __counted_by() --- Documentation/filesystems/overlayfs.rst | 7 +++ fs/overlayfs/file.c | 4 +- fs/overlayfs/namei.c | 98 ++++++++++++++++++++------------- fs/overlayfs/ovl_entry.h | 2 +- fs/overlayfs/params.c | 40 ++------------ fs/overlayfs/readdir.c | 4 +- fs/overlayfs/util.c | 9 ++- 7 files changed, 84 insertions(+), 80 deletions(-)