Miklos, Let's call my previous version v5 (Zhangyi's last post was v4). Changes since v5: - Split ovl_check_empty_and_clear() changes from bug fix patch - Cache "origin" xattr of non-merge dir in inode flag OVL_WHITEOUTS (OVL_ORIGIN would have been too confusing) - Replace layer idx with is_upper boolean I tested these changes with upstream xfstest overlay/031 by Zhangyi. Pushed to ovl-whiteouts branch [1] and rebased the non-samefs patches on top of it [2]. Thanks, Amir. [1] https://github.com/amir73il/linux/commits/ovl-whiteouts [1] https://github.com/amir73il/linux/commits/overlayfs-devel Amir Goldstein (3): ovl: no direct iteration for dir with origin xattr ovl: simplify ovl_check_empty_and_clear() ovl: fix rmdir problem on non-merge dir with origin xattr fs/overlayfs/dir.c | 18 ++++++++++------ fs/overlayfs/inode.c | 5 +++++ fs/overlayfs/overlayfs.h | 4 ++++ fs/overlayfs/readdir.c | 56 ++++++++++++++++++++++++++++++++++++++---------- fs/overlayfs/util.c | 13 +++++++++++ 5 files changed, 79 insertions(+), 17 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html