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..

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index cc4062d12ca21c14793fc392bbec1f20674d434c..4cf3d269e271888b7585701e476e87955d0196bb 100644 (file)
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -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_block *s)
        if (!info)
                return;
 
+       if (s->s_dirt)
+               bfs_write_super(s);
+
        brelse(info->si_sbh);
        mutex_destroy(&info->bfs_lock);
        kfree(info->si_imap);

diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index 9f1985e857e254c5315928e7daf84461baa1a3ca..3cdb761db8ad80544e07989ed2bb9cea8b1e5c31 100644 (file)
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -258,6 +258,9 @@ static void exofs_put_super(struct super_block *sb)
        int 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)) {

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index e3c748faf2dbcd14ceafb13c6353479e6b072eb9..932a2bcb69081a89513740eeeeacc0c23814db33 100644 (file)
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -114,6 +114,9 @@ static void ext2_put_super (struct super_block * sb)
        int 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;

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index f016707597a728c37e6ea0a5150f6b16ac2ae577..c7b8f8d9b7a830785c9e750b9cceb23466979733 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -576,6 +576,9 @@ static void ext4_put_super(struct super_block *sb)
        struct ext4_super_block *es = sbi->s_es;
        int i, err;
 
+       if (sb->s_dirt)
+               ext4_write_super(sb);
+
        ext4_release_system_zone(sb);
        ext4_mb_release(sb);
        ext4_ext_release(sb);

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 296785a0dec8068471d5e5764fd41cea1bcc9903..4978621511bf73102383268e17e73adb570e4f1e 100644 (file)
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -451,6 +451,9 @@ static void fat_put_super(struct super_block *sb)
 {
        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;

diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index a36bb749926da345772e937e5c9af67388af1c05..e071e6d0646369413f64569193906cac64293214 100644 (file)
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -65,6 +65,8 @@ static void hfs_write_super(struct super_block *sb)
  */
 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);

diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index f2a64020f42e1ee855c997bb4c0a713ee0c2f4ee..40bdab79dae8a5bb84cd1019dc3fdb46a6d12335 100644 (file)
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -199,6 +199,8 @@ static void hfsplus_put_super(struct super_block *sb)
        dprint(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;
 

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 4c4e18c54a5119e209ea23a7bb6ad9eb78182b95..5059e9633edbde74fea91635d39cf9a68d48cdb2 100644 (file)
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -174,6 +174,9 @@ static void jffs2_put_super (struct super_block *sb)
 
        D2(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);

diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 6989b03e97ab57517e35abb2f56011775d4af990..7901d8cbb9b1f0ec5e8db66426835defc6342473 100644 (file)
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -65,6 +65,7 @@ MODULE_DESCRIPTION("A New Implementation of the Log-structured Filesystem "
                   "(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 super_block *sb)
        struct 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)) {

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 9dbdcfb5d31484f37b656ff6983517e499aad813..1b52daa351c56d75a734a24a0610a17bedc8ecd0 100644 (file)
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -468,6 +468,9 @@ static void reiserfs_put_super(struct super_block *s)
        struct 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)) {

diff --git a/fs/super.c b/fs/super.c
index 721236e6177ac6da67ce7c918c9c8e1f02b97d21..d9a29d5b1d28068dbcbb1e6e426800a4d278e932 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -311,8 +311,6 @@ void generic_shutdown_super(struct super_block *sb)
                invalidate_inodes(sb);
                lock_kernel();
 
-               if (sop->write_super && sb->s_dirt)
-                       sop->write_super(sb);
                if (sop->put_super)
                        sop->put_super(sb);
 

diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index da20b48d350fdd674d3a7e6ec2fd64984473a20b..cd80316302ccd8dc650c9b86084a44c88c7f1989 100644 (file)
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -72,6 +72,9 @@ static void sysv_put_super(struct super_block *sb)
 {
        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);

diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 60359291761f2eb2a8229f053b1d5763c19115c6..74afb9fbf58e31b87d2fe93b0e00bb15c8431522 100644 (file)
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -1152,6 +1152,9 @@ static void ufs_put_super(struct super_block *sb)
                
        UFSD("ENTER\n");
 
+       if (sb->s_dirt)
+               ufs_write_super(sb);
+
        if (!(sb->s_flags & MS_RDONLY))
                ufs_put_super_internal(sb);