Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 669d5f1f authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by Al Viro
Browse files

AFFS: clean up dirty flag usage 



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: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1b947463

fs/affs/super.c

+5 −14
Original line number Diff line number Diff line
@@ -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

	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,8 +546,6 @@ 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_free_bitmap(sb);

	} else