| From | Valerie Aurora <> | Subject | [PATCH 22/35] union-mount: Call do_whiteout() on unlink and rmdir in unions | Date | Thu, 15 Apr 2010 16:04:29 -0700 |
| |
From: Jan Blunck <jblunck@suse.de>
Call do_whiteout() when removing files and directories from a union mounted file system.
Signed-off-by: Valerie Aurora <vaurora@redhat.com> --- fs/namei.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c index b179062..900df0f 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; @@ -2759,6 +2763,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.6.3.3
|