lkml.org 
[lkml]   [2008]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 01/29] quota: fix possible infinite loop in quota code

    2.6.25-stable review patch. If anyone has any objections, please let us
    know.

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

    From: Jan Kara <jack@suse.cz>

    commit b48d380541f634663b71766005838edbb7261685 upstream

    When quota structure is going to be dropped and it is dirty, quota code tries
    to write it. If the write fails for some reason (e. g. transaction cannot
    be started because the journal is aborted), we try writing again and again and
    again... Fix the problem by clearing the dirty bit even if the write failed.

    (akpm: for 2.6.27, 2.6.26.x and 2.6.25.x)

    Signed-off-by: Jan Kara <jack@suse.cz>
    Reviewed-by: dingdinghua <dingdinghua85@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/dquot.c | 16 +++++++++++++++-
    1 file changed, 15 insertions(+), 1 deletion(-)

    --- a/fs/dquot.c
    +++ b/fs/dquot.c
    @@ -554,6 +554,8 @@ static struct shrinker dqcache_shrinker
    */
    static void dqput(struct dquot *dquot)
    {
    + int ret;
    +
    if (!dquot)
    return;
    #ifdef __DQUOT_PARANOIA
    @@ -586,7 +588,19 @@ we_slept:
    if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags) && dquot_dirty(dquot)) {
    spin_unlock(&dq_list_lock);
    /* Commit dquot before releasing */
    - dquot->dq_sb->dq_op->write_dquot(dquot);
    + ret = dquot->dq_sb->dq_op->write_dquot(dquot);
    + if (ret < 0) {
    + printk(KERN_ERR "VFS: cannot write quota structure on "
    + "device %s (error %d). Quota may get out of "
    + "sync!\n", dquot->dq_sb->s_id, ret);
    + /*
    + * We clear dirty bit anyway, so that we avoid
    + * infinite loop here
    + */
    + spin_lock(&dq_list_lock);
    + clear_dquot_dirty(dquot);
    + spin_unlock(&dq_list_lock);
    + }
    goto we_slept;
    }
    /* Clear flag in case dquot was inactive (something bad happened) */
    --


    \
     
     \ /
      Last update: 2008-07-31 01:35    [W:0.023 / U:60.644 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site