lkml.org 
[lkml]   [2010]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/38] union-mount: Call do_whiteout() on unlink and rmdir in unions
    Date
    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 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


    \
     
     \ /
      Last update: 2010-06-25 21:09    [W:0.020 / U:30.996 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site