remove ->write_super call in generic_shutdown_super
Subsystems (8)
PATCH 1/1 remove ->write_super call in generic_shutdown_super
We just did a full fs writeout using sync_filesystem before, and if that's not enough for the filesystem it can perform it's own writeout in ->put_super, which many filesystems already do.
Move a call to foofs_write_super into every foofs_put_super for now to guarantee identical behaviour until it's cleaned up by the individual filesystem maintainers.
Exceptions:
- affs already has identical copy & pasted code at the beginning of affs_put_super so no need to do it twice.
- xfs does the right thing without it and I have changes pending for the xfs tree touching this are so I don't really need conflicts here..
fs/super.c +0 -2
@@ -283,8 +283,6 @@ void generic_shutdown_super(struct superinvalidate_inodes (sb);lock_kernel (); -if (sop->write_super && sb->s_dirt) - sop->write_super (sb);if (sop->put_super) sop->put_super (sb);
fs/jffs2/super.c +3 -0
@@ -174,6 +174,9 @@ static void jffs2_put_super (struct supeD2 (printk (KERN_DEBUG "jffs2: jffs2_put_super()\n" )); +if (sb->s_dirt) +jffs2_write_super (sb); +mutex_lock (&c->alloc_sem);jffs2_flush_wbuf_pad (c);mutex_unlock (&c->alloc_sem);
fs/bfs/inode.c +4 -0
@@ -30,6 +30,7 @@ MODULE_LICENSE("GPL"); #define dprintf(x...)#endif +static void bfs_write_super (struct super_block *s);void dump_imap (const char *prefix,struct super_block *s);struct inode *bfs_iget (struct super_block *sb,unsigned long ino)
@@ -216,6 +217,9 @@ static void bfs_put_super(struct super_bif (!info)return ; +if (s->s_dirt) +bfs_write_super (s); +brelse (info->si_sbh);mutex_destroy (&info->bfs_lock);kfree (info->si_imap);
fs/exofs/super.c +3 -0
@@ -258,6 +258,9 @@ static void exofs_put_super(struct superint num_pend;struct exofs_sb_info *sbi = sb->s_fs_info; +if (sb->s_dirt) +exofs_write_super (sb); +/* make sure there are no pending commands */ for (num_pend =atomic_read (&sbi->s_curr_pending); num_pend >0 ; num_pend =atomic_read (&sbi->s_curr_pending)) {
fs/ext2/super.c +3 -0
@@ -114,6 +114,9 @@ static void ext2_put_super (struct superint i;struct ext2_sb_info *sbi =EXT2_SB (sb); +if (sb->s_dirt) +ext2_write_super (sb); +ext2_xattr_put_super (sb);if (!(sb->s_flags &MS_RDONLY )) {struct ext2_super_block *es = sbi->s_es;
fs/ext4/super.c +3 -0
@@ -563,6 +563,9 @@ static void ext4_put_super(struct super_struct ext4_super_block *es = sbi->s_es;int i, err; +if (sb->s_dirt) +ext4_write_super (sb); +ext4_mb_release (sb);ext4_ext_release (sb);ext4_xattr_put_super (sb);
fs/fat/inode.c +3 -0
@@ -451,6 +451,9 @@ static void fat_put_super(struct super_b {struct msdos_sb_info *sbi =MSDOS_SB (sb); +if (sb->s_dirt) +fat_write_super (sb); +if (sbi->nls_disk) {unload_nls (sbi->nls_disk); sbi->nls_disk =NULL ;
fs/hfs/super.c +2 -0
@@ -65,6 +65,8 @@ static void hfs_write_super(struct super*/ static void hfs_put_super (struct super_block *sb) { +if (sb->s_dirt) +hfs_write_super (sb);hfs_mdb_close (sb);/* release the MDB's resources */ hfs_mdb_put (sb);
fs/hfsplus/super.c +2 -0
@@ -199,6 +199,8 @@ static void hfsplus_put_super(struct supdprint (DBG_SUPER ,"hfsplus_put_super\n" );if (!sb->s_fs_info)return ; +if (sb->s_dirt) +hfsplus_write_super (sb);if (!(sb->s_flags &MS_RDONLY ) &&HFSPLUS_SB (sb).s_vhdr) {struct hfsplus_vh *vhdr =HFSPLUS_SB (sb).s_vhdr;
fs/nilfs2/super.c +4 -0
@@ -65,6 +65,7 @@ MODULE_DESCRIPTION("A New Implementation "(NILFS)");MODULE_LICENSE ("GPL" ); +static void nilfs_write_super (struct super_block *sb);static int nilfs_remount (struct super_block *sb,int *flags,char *data);static int test_exclusive_mount (struct file_system_type *fs_type,struct block_device *bdev,int flags);
@@ -315,6 +316,9 @@ static void nilfs_put_super(struct superstruct nilfs_sb_info *sbi =NILFS_SB (sb);struct the_nilfs *nilfs = sbi->s_nilfs; +if (sb->s_dirt) +nilfs_write_super (sb); +nilfs_detach_segment_constructor (sbi);if (!(sb->s_flags &MS_RDONLY )) {
fs/reiserfs/super.c +3 -0
@@ -470,6 +470,9 @@ static void reiserfs_put_super(struct sustruct reiserfs_transaction_handle th; th.t_trans_id =0 ; +if (s->s_dirt) +reiserfs_write_super (s); +/* change file system state to current state if it was mounted with read-write permissions */ if (!(s->s_flags &MS_RDONLY )) {if (!journal_begin (&th, s,10 )) {
fs/sysv/inode.c +3 -0
@@ -72,6 +72,9 @@ static void sysv_put_super(struct super_ {struct sysv_sb_info *sbi =SYSV_SB (sb); +if (sb->s_dirt) +sysv_write_super (sb); +if (!(sb->s_flags &MS_RDONLY )) {/* XXX ext2 also updates the state here */ mark_buffer_dirty (sbi->s_bh1);
fs/ufs/super.c +3 -0
@@ -1152,6 +1152,9 @@ static void ufs_put_super(struct super_bUFSD ("ENTER\n" ); +if (sb->s_dirt) +ufs_write_super (sb); +if (!(sb->s_flags &MS_RDONLY ))ufs_put_super_internal (sb);
Quoted 19 lines · Christoph Hellwig
We just did a full fs writeout using
sync_filesystembefore, and if that's not enough for the filesystem it can perform it's own writeout in ->put_super, which many filesystems already do.Move a call to
foofs_write_superinto everyfoofs_put_superfor now to guarantee identical behaviour until it's cleaned up by the individual filesystem maintainers.Exceptions:
- affs already has identical copy & pasted code at the beginning of
affs_put_superso no need to do it twice.
- xfs does the right thing without it and I have changes pending for the xfs tree touching this are so I don't really need conflicts here..Signed-off-by Christoph Hellwig <[email protected]>
<snip>
fs/exofs/super.c static void exofs_put_super(struct super · line 266
Quoted 13 lines
===================================================================
fs/exofs/super.c +3
-0@@ -258,6 +258,9 @@ static void exofs_put_super(struct superint num_pend;struct exofs_sb_info *sbi = sb->s_fs_info; +if (sb->s_dirt) +exofs_write_super (sb); +/* make sure there are no pending commands */ for (num_pend =atomic_read (&sbi->s_curr_pending); num_pend >0 ; num_pend =atomic_read (&sbi->s_curr_pending)) {
<snip>
I'll put it on my TODO list to see if this can be removed, later.
Boaz
Quoted 18 lines · Christoph Hellwig
We just did a full fs writeout using
sync_filesystembefore, and if that's not enough for the filesystem it can perform it's own writeout in ->put_super, which many filesystems already do.Move a call to
foofs_write_superinto everyfoofs_put_superfor now to guarantee identical behaviour until it's cleaned up by the individual filesystem maintainers.Exceptions:
- affs already has identical copy & pasted code at the beginning of
affs_put_superso no need to do it twice.
- xfs does the right thing without it and I have changes pending for the xfs tree touching this are so I don't really need conflicts here..Signed-off-by Christoph Hellwig <[email protected]>
<snip>
Quoted 12 lines
===================================================================
fs/nilfs2/super.c +1
-0@@ -65,6 +65,7 @@ MODULE_DESCRIPTION("A New Implementation "(NILFS)");MODULE_LICENSE ("GPL" ); +static void nilfs_write_super (struct super_block *sb);static int nilfs_remount (struct super_block *sb,int *flags,char *data);static int test_exclusive_mount (struct file_system_type *fs_type,struct block_device *bdev,int flags);
fs/nilfs2/super.c static void nilfs_put_super(struct super · line 324
Quoted 9 lines
fs/nilfs2/super.c +3
-0@@ -315,6 +316,9 @@ static void nilfs_put_super(struct superstruct nilfs_sb_info *sbi =NILFS_SB (sb);struct the_nilfs *nilfs = sbi->s_nilfs; +if (sb->s_dirt) +nilfs_write_super (sb); +nilfs_detach_segment_constructor (sbi);if (!(sb->s_flags &MS_RDONLY )) {
This nilfs_write_super could be deleted, too.
I'll queue an addition later as needed.
Thanks,
Ryusuke Konishi