Hi Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs-linus This fixes d_ino correctness in readdir, which brings overlayfs on par with normal filesystems regarding inode number semantics, as long as all layers are on the same filesystem. There are also some bug fixes, one in particular (random ioctl's shouldn't be able to modify lower layers) that touches some vfs code, but of course no-op for non-overlay fs. Thanks, Miklos --- Amir Goldstein (2): ovl: constant d_ino across copy up ovl: fix false positive ESTALE on lookup Miklos Szeredi (7): ovl: check snprintf return ovl: fix readdir error value ovl: constant d_ino for non-merge dirs ovl: cleanup d_real for negative vfs: add flags to d_real() ovl: fix relatime for directories ovl: don't allow writing ioctl on lower layer --- Documentation/filesystems/Locking | 2 +- Documentation/filesystems/vfs.txt | 2 +- fs/inode.c | 21 ++- fs/internal.h | 2 + fs/namespace.c | 64 ++++++- fs/open.c | 8 +- fs/overlayfs/dir.c | 11 +- fs/overlayfs/inode.c | 14 +- fs/overlayfs/overlayfs.h | 8 +- fs/overlayfs/readdir.c | 383 ++++++++++++++++++++++++++++++++++---- fs/overlayfs/super.c | 11 +- fs/overlayfs/util.c | 24 ++- fs/xattr.c | 9 +- include/linux/dcache.h | 14 +- include/linux/fs.h | 2 +- 15 files changed, 496 insertions(+), 79 deletions(-)