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

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

affs: re-structure superblock locking a bit 



AFFS wants to serialize the superblock (the root block in AFFS terms) updates
and uses 'lock_super()/unlock_super()' for these purposes. This patch pushes the
locking down to the 'affs_commit_super()' from the callers.

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 0164b1a3

fs/affs/super.c

+2 −5
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ affs_commit_super(struct super_block *sb, int wait) 
	struct buffer_head *bh = sbi->s_root_bh;

	struct affs_root_tail *tail = AFFS_ROOT_TAIL(sb, bh);



	lock_super(sb);

	secs_to_datestamp(get_seconds(), &tail->disk_change);

	affs_fix_checksum(sb, bh);

	mark_buffer_dirty(bh);

	if (wait)

		sync_dirty_buffer(bh);

	unlock_super(sb);

}



static void
@@ -54,22 +56,17 @@ affs_put_super(struct super_block *sb) 
static void

affs_write_super(struct super_block *sb)

{

	lock_super(sb);

	if (!(sb->s_flags & MS_RDONLY))

		affs_commit_super(sb, 1);

	sb->s_dirt = 0;

	unlock_super(sb);



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

}



static int

affs_sync_fs(struct super_block *sb, int wait)

{

	lock_super(sb);

	affs_commit_super(sb, wait);

	sb->s_dirt = 0;

	unlock_super(sb);

	return 0;

}