lkml.org 
[lkml]   [2010]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 33/35] union-mount: Implement union-aware chmod()/fchmodat()
    Date
    ---
    fs/open.c | 25 +++++++++++++++++++++----
    1 files changed, 21 insertions(+), 4 deletions(-)

    diff --git a/fs/open.c b/fs/open.c
    index dda1b6f..6ec99e9 100644
    --- a/fs/open.c
    +++ b/fs/open.c
    @@ -669,18 +669,32 @@ out:
    SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode)
    {
    struct path path;
    + struct nameidata nd;
    + struct vfsmount *mnt;
    struct inode *inode;
    + char *tmp;
    int error;
    struct iattr newattrs;

    - error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
    + error = user_path_nd(dfd, filename, LOOKUP_FOLLOW, &nd,
    + &path, &tmp);
    if (error)
    goto out;
    - inode = path.dentry->d_inode;

    - error = mnt_want_write(path.mnt);
    + if (IS_UNIONED_DIR(&nd.path))
    + mnt = nd.path.mnt;
    + else
    + mnt = path.mnt;
    +
    + error = mnt_want_write(mnt);
    if (error)
    goto dput_and_out;
    +
    + error = union_copyup(&nd, &path);
    + if (error)
    + goto mnt_drop_write_and_out;
    +
    + inode = path.dentry->d_inode;
    mutex_lock(&inode->i_mutex);
    error = security_path_chmod(path.dentry, path.mnt, mode);
    if (error)
    @@ -692,9 +706,12 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode)
    error = notify_change(path.dentry, &newattrs);
    out_unlock:
    mutex_unlock(&inode->i_mutex);
    - mnt_drop_write(path.mnt);
    +mnt_drop_write_and_out:
    + mnt_drop_write(mnt);
    dput_and_out:
    path_put(&path);
    + path_put(&nd.path);
    + putname(tmp);
    out:
    return error;
    }
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2010-04-16 01:11    [W:4.209 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site