lkml.org 
[lkml]   [2006]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[RFC][PATCH 14/20] elevate write count for do_utimes()
    From
    Date


    Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
    ---

    lxc-dave/fs/open.c | 13 +++++++++----
    1 files changed, 9 insertions(+), 4 deletions(-)

    diff -puN fs/open.c~C-elevate-writers-opens-part2-do_utimes fs/open.c
    --- lxc/fs/open.c~C-elevate-writers-opens-part2-do_utimes 2006-06-16 15:58:08.000000000 -0700
    +++ lxc-dave/fs/open.c 2006-06-16 15:58:08.000000000 -0700
    @@ -441,16 +441,19 @@ long do_utimes(int dfd, char __user *fil
    goto out;
    inode = nd.dentry->d_inode;

    + error = mnt_want_write(nd.mnt);
    + if (error)
    + goto dput_and_out;
    error = -EROFS;
    if (IS_RDONLY(inode))
    - goto dput_and_out;
    + goto mnt_drop_write_and_out;

    /* Don't worry, the checks are done in inode_change_ok() */
    newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME;
    if (times) {
    error = -EPERM;
    if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
    - goto dput_and_out;
    + goto mnt_drop_write_and_out;

    newattrs.ia_atime.tv_sec = times[0].tv_sec;
    newattrs.ia_atime.tv_nsec = times[0].tv_usec * 1000;
    @@ -460,15 +463,17 @@ long do_utimes(int dfd, char __user *fil
    } else {
    error = -EACCES;
    if (IS_IMMUTABLE(inode))
    - goto dput_and_out;
    + goto mnt_drop_write_and_out;

    if (current->fsuid != inode->i_uid &&
    (error = vfs_permission(&nd, MAY_WRITE)) != 0)
    - goto dput_and_out;
    + goto mnt_drop_write_and_out;
    }
    mutex_lock(&inode->i_mutex);
    error = notify_change(nd.dentry, &newattrs);
    mutex_unlock(&inode->i_mutex);
    +mnt_drop_write_and_out:
    + mnt_drop_write(nd.mnt);
    dput_and_out:
    path_release(&nd);
    out:
    _
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-06-17 01:21    [W:0.020 / U:93.836 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site