[PATCH 23/38] union-mount: Call do_whiteout() on unlink and rmdir in unions
in [Kernel]
|
Prev: [PATCH 33/38] union-mount: Implement union-aware truncate()
Next: [PATCH 28/38] union-mount: Implement union-aware access()/faccessat()
From: Valerie Aurora on 25 Jun 2010 15:10 From: Jan Blunck <jblunck(a)suse.de> Call do_whiteout() when removing files and directories from a union mounted file system. Signed-off-by: Valerie Aurora <vaurora(a)redhat.com> --- fs/namei.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 3f969af..c17693f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2595,6 +2595,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); @@ -2684,6 +2688,10 @@ static long do_unlinkat(int dfd, const char __user *pathname) error = security_path_unlink(&nd.path, path.dentry); if (error) goto exit3; + if (IS_DIR_UNIONED(nd.path.dentry)) { + error = do_whiteout(&nd, &path, 0); + goto exit3; + } error = vfs_unlink(nd.path.dentry->d_inode, path.dentry); exit3: mnt_drop_write(nd.path.mnt); -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |