lkml.org 
[lkml]   [2014]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 039/233] GFS2: Increase i_writecount during gfs2_setattr_chown
    Date
    3.11.10.4 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bob Peterson <rpeterso@redhat.com>

    commit 62e96cf81988101fe9e086b2877307b6adda5197 upstream.

    This patch calls get_write_access in function gfs2_setattr_chown,
    which merely increases inode->i_writecount for the duration of the
    function. That will ensure that any file closes won't delete the
    inode's multi-block reservation while the function is running.
    It also ensures that a multi-block reservation exists when needed
    for quota change operations during the chown.

    Signed-off-by: Bob Peterson <rpeterso@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    fs/gfs2/inode.c | 16 +++++++++++++++-
    1 file changed, 15 insertions(+), 1 deletion(-)

    diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
    index e4bd52f..94b7068 100644
    --- a/fs/gfs2/inode.c
    +++ b/fs/gfs2/inode.c
    @@ -1608,10 +1608,22 @@ static int setattr_chown(struct inode *inode, struct iattr *attr)
    if (!(attr->ia_valid & ATTR_GID) || gid_eq(ogid, ngid))
    ogid = ngid = NO_GID_QUOTA_CHANGE;

    - error = gfs2_quota_lock(ip, nuid, ngid);
    + error = get_write_access(inode);
    if (error)
    return error;

    + error = gfs2_rs_alloc(ip);
    + if (error)
    + goto out;
    +
    + error = gfs2_rindex_update(sdp);
    + if (error)
    + goto out;
    +
    + error = gfs2_quota_lock(ip, nuid, ngid);
    + if (error)
    + goto out;
    +
    if (!uid_eq(ouid, NO_UID_QUOTA_CHANGE) ||
    !gid_eq(ogid, NO_GID_QUOTA_CHANGE)) {
    error = gfs2_quota_check(ip, nuid, ngid);
    @@ -1638,6 +1650,8 @@ out_end_trans:
    gfs2_trans_end(sdp);
    out_gunlock_q:
    gfs2_quota_unlock(ip);
    +out:
    + put_write_access(inode);
    return error;
    }

    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-02-08 04:21    [W:4.191 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site