From: Jan Blunck <jblunck@xxxxxxx> Call do_whiteout() when removing files and directories from a union mounted file system. Signed-off-by: Valerie Aurora <vaurora@xxxxxxxxxx> --- fs/namei.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 85d95fc..9797074 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2670,6 +2670,10 @@ static long do_rmdir(int dfd, const char __user *pathname) error = mnt_want_write(nd.path.mnt); if (error) goto exit3; + if (IS_UNIONED_DIR(&nd.path)) { + error = do_whiteout(&nd, &path, 1); + goto exit4; + } error = security_path_rmdir(&nd.path, path.dentry); if (error) goto exit4; @@ -2758,6 +2762,10 @@ static long do_unlinkat(int dfd, const char __user *pathname) error = mnt_want_write(nd.path.mnt); if (error) goto exit2; + if (IS_UNIONED_DIR(&nd.path)) { + error = do_whiteout(&nd, &path, 0); + goto exit3; + } error = security_path_unlink(&nd.path, path.dentry); if (error) goto exit3; -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html