OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Artem Bityutskiy 2012-06-06 18:56:54 +03:00 committed by Al Viro
parent 0164b1a32e
commit e0471c8d8a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/affs/super.c
View File

@ -31,11 +31,13 @@ affs_commit_super(struct super_block *sb, int wait)
struct buffer_head *bh = sbi->s_root_bh; struct buffer_head *bh = sbi->s_root_bh;
struct affs_root_tail *tail = AFFS_ROOT_TAIL(sb, bh); struct affs_root_tail *tail = AFFS_ROOT_TAIL(sb, bh);
lock_super(sb);
secs_to_datestamp(get_seconds(), &tail->disk_change); secs_to_datestamp(get_seconds(), &tail->disk_change);
affs_fix_checksum(sb, bh); affs_fix_checksum(sb, bh);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
if (wait) if (wait)
sync_dirty_buffer(bh); sync_dirty_buffer(bh);
unlock_super(sb);
} }
static void static void
@ -54,22 +56,17 @@ affs_put_super(struct super_block *sb)
static void static void
affs_write_super(struct super_block *sb) affs_write_super(struct super_block *sb)
{ {
lock_super(sb);
if (!(sb->s_flags & MS_RDONLY)) if (!(sb->s_flags & MS_RDONLY))
affs_commit_super(sb, 1); affs_commit_super(sb, 1);
sb->s_dirt = 0; sb->s_dirt = 0;
unlock_super(sb);
pr_debug("AFFS: write_super() at %lu, clean=2\n", get_seconds()); pr_debug("AFFS: write_super() at %lu, clean=2\n", get_seconds());
} }
static int static int
affs_sync_fs(struct super_block *sb, int wait) affs_sync_fs(struct super_block *sb, int wait)
{ {
lock_super(sb);
affs_commit_super(sb, wait); affs_commit_super(sb, wait);
sb->s_dirt = 0; sb->s_dirt = 0;
unlock_super(sb);
return 0; return 0;
} }