[PATCH 4/7] affs: re-structure superblock locking a bit

From: Artem Bityutskiy
Date: Tue Jun 05 2012 - 07:28:07 EST


From: Artem Bityutskiy <artem.bityutskiy@xxxxxxxxxxxxxxx>

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@xxxxxxxxxxxxxxx>
---
fs/affs/super.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/affs/super.c b/fs/affs/super.c
index 3fc50b1..8293cb9 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -31,12 +31,14 @@ 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);
tail->bm_flag = cpu_to_be32(2);
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
@@ -55,22 +57,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;
}

--
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/