From: Valerie Aurora <vaurora@xxxxxxxxxx> Whiteout a deleted directory in a union mounted file system. Signed-off-by: Valerie Aurora <valerie.aurora@xxxxxxxxx> --- fs/namei.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 83f9c62..9c6803a 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2597,11 +2597,6 @@ static long do_rmdir(int dfd, const char __user *pathname) if (error) return error; - /* rmdir() on union mounts not implemented yet */ - error = -EINVAL; - if (IS_DIR_UNIONED(nd.path.dentry)) - goto exit1; - switch(nd.last_type) { case LAST_DOTDOT: error = -ENOTEMPTY; @@ -2626,6 +2621,10 @@ static long do_rmdir(int dfd, const char __user *pathname) error = security_path_rmdir(&nd.path, path.dentry); if (error) goto exit4; + if (IS_DIR_UNIONED(nd.path.dentry)) { + error = do_whiteout(&nd, &path, 1); + goto exit4; + } error = vfs_rmdir(nd.path.dentry->d_inode, path.dentry); exit4: mnt_drop_write(nd.path.mnt); -- 1.7.0.4 -- 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