diff options
| author | Christoph Hellwig <hch@lst.de> | 2009-05-11 23:35:03 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-11 21:36:09 -0400 |
| commit | ebc1ac164560a241d9bf1b7519062910c3f90a01 (patch) | |
| tree | db17fd3043b15f8269cce2c2d00213814022fc30 /fs/jffs2 | |
| parent | 01ba687577647beef6c5f2ea59bfb56fac9fcde2 (diff) | |
| download | linux-ebc1ac164560a241d9bf1b7519062910c3f90a01.tar.gz linux-ebc1ac164560a241d9bf1b7519062910c3f90a01.tar.bz2 linux-ebc1ac164560a241d9bf1b7519062910c3f90a01.zip | |
->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')
| -rw-r--r-- | fs/jffs2/super.c | 15 |
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) static void jffs2_write_super(struct super_block *sb) { struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); + + lock_super(sb); sb->s_dirt = 0; - if (sb->s_flags & MS_RDONLY) - return; + if (!(sb->s_flags & MS_RDONLY)) { + D1(printk(KERN_DEBUG "jffs2_write_super()\n")); + jffs2_garbage_collect_trigger(c); + jffs2_erase_pending_blocks(c, 0); + jffs2_flush_wbuf_gc(c, 0); + } - D1(printk(KERN_DEBUG "jffs2_write_super()\n")); - jffs2_garbage_collect_trigger(c); - jffs2_erase_pending_blocks(c, 0); - jffs2_flush_wbuf_gc(c, 0); + unlock_super(sb); } static int jffs2_sync_fs(struct super_block *sb, int wait) |