AFFS: clean up dirty flag usage
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Mon, 5 Jul 2010 12:14:59 +0000 (15:14 +0300)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 9 Aug 2010 20:48:50 +0000 (16:48 -0400)
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.

Tested-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/affs/super.c

index 2c804a8..fde3b9a 100644 (file)
@@ -61,20 +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);
-               sb->s_dirt = !clean;    /* redo until bitmap synced */
-       } else
-               sb->s_dirt = 0;
+       if (!(sb->s_flags & MS_RDONLY))
+               affs_commit_super(sb, 2);
+       sb->s_dirt = 0;
        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
@@ -553,9 +546,7 @@ affs_remount(struct super_block *sb, int *flags, char *data)
                return 0;
        }
        if (*flags & MS_RDONLY) {
-               sb->s_dirt = 1;
-               while (sb->s_dirt)
-                       affs_write_super(sb);
+               affs_write_super(sb);
                affs_free_bitmap(sb);
        } else
                res = affs_init_bitmap(sb, flags);