aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/super.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-05-11 17:35:03 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2009-06-11 21:36:09 -0400
commitebc1ac164560a241d9bf1b7519062910c3f90a01 (patch)
treedb17fd3043b15f8269cce2c2d00213814022fc30 /fs/jffs2/super.c
parent01ba687577647beef6c5f2ea59bfb56fac9fcde2 (diff)
->write_super lock_super pushdown
Push down lock_super into ->write_super instances and remove it from the caller. Following filesystem don't need ->s_lock in ->write_super and are skipped: * bfs, nilfs2 - no other uses of s_lock and have internal locks in ->write_super * ext2 - uses BKL in ext2_write_super and has internal calls without s_lock * reiserfs - no other uses of s_lock as has reiserfs_write_lock (BKL) in ->write_super * xfs - no other uses of s_lock and uses internal lock (buffer lock on superblock buffer) to serialize ->write_super. Also xfs_fs_write_super is superflous and will go away in the next merge window Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/jffs2/super.c')
-rw-r--r--fs/jffs2/super.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index a80a50e445e2..f7bfd3ac8bfa 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -56,15 +56,18 @@ static void jffs2_i_init_once(void *foo)
56static void jffs2_write_super(struct super_block *sb) 56static void jffs2_write_super(struct super_block *sb)
57{ 57{
58 struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); 58 struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);
59
60 lock_super(sb);
59 sb->s_dirt = 0; 61 sb->s_dirt = 0;
60 62
61 if (sb->s_flags & MS_RDONLY) 63 if (!(sb->s_flags & MS_RDONLY)) {
62 return; 64 D1(printk(KERN_DEBUG "jffs2_write_super()\n"));
65 jffs2_garbage_collect_trigger(c);
66 jffs2_erase_pending_blocks(c, 0);
67 jffs2_flush_wbuf_gc(c, 0);
68 }
63 69
64 D1(printk(KERN_DEBUG "jffs2_write_super()\n")); 70 unlock_super(sb);
65 jffs2_garbage_collect_trigger(c);
66 jffs2_erase_pending_blocks(c, 0);
67 jffs2_flush_wbuf_gc(c, 0);
68} 71}
69 72
70static int jffs2_sync_fs(struct super_block *sb, int wait) 73static int jffs2_sync_fs(struct super_block *sb, int wait)