lkml.org 
[lkml]   [2012]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 62/89] reiserfs: Protect reiserfs_quota_on() with write lock
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jan Kara <jack@suse.cz>

    commit b9e06ef2e8706fe669b51f4364e3aeed58639eb2 upstream.

    In reiserfs_quota_on() we do quite some work - for example unpacking
    tail of a quota file. Thus we have to hold write lock until a moment
    we call back into the quota code.

    Signed-off-by: Jan Kara <jack@suse.cz>
    [bwh: Backported to 3.2: there is no distinction between USRQUOTA and
    GRPQUOTA mount options here]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    fs/reiserfs/super.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    --- a/fs/reiserfs/super.c
    +++ b/fs/reiserfs/super.c
    @@ -2073,8 +2073,11 @@ static int reiserfs_quota_on(struct supe
    struct inode *inode;
    struct reiserfs_transaction_handle th;

    - if (!(REISERFS_SB(sb)->s_mount_opt & (1 << REISERFS_QUOTA)))
    - return -EINVAL;
    + reiserfs_write_lock(sb);
    + if (!(REISERFS_SB(sb)->s_mount_opt & (1 << REISERFS_QUOTA))) {
    + err = -EINVAL;
    + goto out;
    + }

    /* Quotafile not on the same filesystem? */
    if (path->mnt->mnt_sb != sb) {
    @@ -2116,8 +2119,10 @@ static int reiserfs_quota_on(struct supe
    if (err)
    goto out;
    }
    - err = dquot_quota_on(sb, type, format_id, path);
    + reiserfs_write_unlock(sb);
    + return dquot_quota_on(sb, type, format_id, path);
    out:
    + reiserfs_write_unlock(sb);
    return err;
    }




    \
     
     \ /
      Last update: 2012-12-03 16:41    [W:4.389 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site