lkml.org 
[lkml]   [2010]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv5 05/16] AFFS: clean up dirty flag usage
    Date
    From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

    In 'affs_write_super()': remove ancient and wrong commented code,
    remove unneeded 'clean' variable, so the function becomes a bit
    cleaner and simpler.

    In 'affs_remount(): remove unnecessary SB dirty flag changes.

    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    Cc: Roman Zippel <zippel@linux-m68k.org>
    ---
    fs/affs/super.c | 23 +++++------------------
    1 files changed, 5 insertions(+), 18 deletions(-)

    diff --git a/fs/affs/super.c b/fs/affs/super.c
    index e391eed..ea00518 100644
    --- a/fs/affs/super.c
    +++ b/fs/affs/super.c
    @@ -61,24 +61,13 @@ affs_put_super(struct super_block *sb)
    static void
    affs_write_super(struct super_block *sb)
    {
    - int clean = 2;
    -
    lock_super(sb);
    - if (!(sb->s_flags & MS_RDONLY)) {
    - // if (sbi->s_bitmap[i].bm_bh) {
    - // if (buffer_dirty(sbi->s_bitmap[i].bm_bh)) {
    - // clean = 0;
    - affs_commit_super(sb, clean);
    - /* redo until bitmap synced */
    - if (clean)
    - sb_mark_clean(sb);
    - else
    - sb_mark_dirty(sb);
    - } else
    - sb_mark_clean(sb);
    + if (!(sb->s_flags & MS_RDONLY))
    + affs_commit_super(sb, 2);
    + sb_mark_clean(sb);
    unlock_super(sb);

    - pr_debug("AFFS: write_super() at %lu, clean=%d\n", get_seconds(), clean);
    + pr_debug("AFFS: write_super() at %lu, clean=2\n", get_seconds());
    }

    static int
    @@ -558,9 +547,7 @@ affs_remount(struct super_block *sb, int *flags, char *data)
    return 0;
    }
    if (*flags & MS_RDONLY) {
    - sb_mark_dirty(sb);
    - while (sb_is_dirty(sb))
    - affs_write_super(sb);
    + affs_write_super(sb);
    affs_free_bitmap(sb);
    } else
    res = affs_init_bitmap(sb, flags);
    --
    1.7.0.1


    \
     
     \ /
      Last update: 2010-06-06 16:59    [W:0.037 / U:0.196 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site