Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

Pull in pre-requisites for adding raid10 support to dm-raid.

1 files changed, 1 insertions, 17 deletions

diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index 08d0b2568cd3..80e1e2b18df1 100644
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -43,7 +43,6 @@ static int sysv_sync_fs(struct super_block *sb, int wait)
          * then attach current time stamp.
          * But if the filesystem was marked clean, keep it clean.
          */
-        sb->s_dirt = 0;
         old_time = fs32_to_cpu(sbi, *sbi->s_sb_time);
         if (sbi->s_type == FSTYPE_SYSV4) {
                 if (*sbi->s_sb_state == cpu_to_fs32(sbi, 0x7c269d38 - old_time))
@@ -57,23 +56,12 @@ static int sysv_sync_fs(struct super_block *sb, int wait)
         return 0;
 }
 
-static void sysv_write_super(struct super_block *sb)
-{
-        if (!(sb->s_flags & MS_RDONLY))
-                sysv_sync_fs(sb, 1);
-        else
-                sb->s_dirt = 0;
-}
-
 static int sysv_remount(struct super_block *sb, int *flags, char *data)
 {
         struct sysv_sb_info *sbi = SYSV_SB(sb);
-        lock_super(sb);
+
         if (sbi->s_forced_ro)
                 *flags |= MS_RDONLY;
-        if (*flags & MS_RDONLY)
-                sysv_write_super(sb);
-        unlock_super(sb);
         return 0;
 }
 
@@ -81,9 +69,6 @@ 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);
@@ -357,7 +342,6 @@ const struct super_operations sysv_sops = {
         .write_inode    = sysv_write_inode,
         .evict_inode    = sysv_evict_inode,
         .put_super      = sysv_put_super,
-        .write_super    = sysv_write_super,
         .sync_fs        = sysv_sync_fs,
         .remount_fs     = sysv_remount,
         .statfs         = sysv_statfs,