lkml.org 
[lkml]   [2009]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 26/32] union-mount: call do_whiteout() on unlink and rmdir
    Date
    Call do_whiteout() when removing files and directories.

    Signed-off-by: Jan Blunck <jblunck@suse.de>
    Signed-off-by: Valerie Aurora (Henson) <vaurora@redhat.com>
    ---
    fs/namei.c | 12 ++++++++++++
    1 files changed, 12 insertions(+), 0 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index 78eb973..4d68597 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2825,6 +2825,10 @@ static int do_whiteout(struct nameidata *nd, struct path *path, int isdir)
    if (err)
    goto out;

    + err = -ENOENT;
    + if (!dentry->d_inode)
    + goto out;
    +
    err = -ENOTEMPTY;
    if (isdir && !directory_is_empty(path->dentry, path->mnt))
    goto out;
    @@ -2939,6 +2943,10 @@ static long do_rmdir(int dfd, const char __user *pathname)
    error = hash_lookup_union(&nd, &nd.last, &path);
    if (error)
    goto exit2;
    + if (is_unionized(nd.path.dentry, nd.path.mnt)) {
    + error = do_whiteout(&nd, &path, 1);
    + goto exit3;
    + }
    error = mnt_want_write(nd.path.mnt);
    if (error)
    goto exit3;
    @@ -3027,6 +3035,10 @@ static long do_unlinkat(int dfd, const char __user *pathname)
    inode = path.dentry->d_inode;
    if (inode)
    atomic_inc(&inode->i_count);
    + if (is_unionized(nd.path.dentry, nd.path.mnt)) {
    + error = do_whiteout(&nd, &path, 0);
    + goto exit2;
    + }
    error = mnt_want_write(nd.path.mnt);
    if (error)
    goto exit2;
    --
    1.6.1.3


    \
     
     \ /
      Last update: 2009-05-18 18:13    [W:0.024 / U:61.732 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site