aboutsummaryrefslogtreecommitdiff
path: root/fs/affs
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-06-06 18:56:54 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2012-07-14 16:32:43 +0400
commite0471c8d8abbc2b07fc82f7b02896d1637909319 (patch)
tree66af7fa7aca968deb48379697c0cd1dabd053dbb /fs/affs
parent0164b1a32e6849121ea73ef3124a2994951a4713 (diff)
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>
Diffstat (limited to 'fs/affs')
-rw-r--r--fs/affs/super.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/affs/super.c b/fs/affs/super.c
index c837e43687a..4ceec563643 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -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;
}