ovl: simplify ovl_check_empty_and_clear()

Browse source

Filter out non-whiteout non-upper entries from list of merge dir entries
while checking if merge dir is empty in ovl_check_empty_dir().
The remaining work for ovl_clear_empty() is to clear all entries on the
list.

[amir: split patch from rmdir bug fix]

Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

...

This commit is contained in:

zhangyi (F) 2017-10-31 22:57:00 +02:00 • committed by Miklos Szeredi

parent b79e05aaa1

commit 95e598e7ac

2 changed files with 22 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

fs/overlayfs/dir.c

View file

27

fs/overlayfs/readdir.c

View file