ext4: convert last user of ext4_mark_super_dirty() to ext4_handle_dirty_super()

The last user of ext4_mark_super_dirty() in ext4_file_open() is so
rare it can well be modifying the superblock properly by journalling
the change.  Change it and get rid of ext4_mark_super_dirty() as it's
not needed anymore.

Artem: small amendments.
Artem: tested using xfstests for both journalled and non-journalled ext4.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Tested-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index e8e8afa402f171188f7382cacdc7d681223ec0bf..c3411d4ce2da57e6e80874be488be00c681e673c 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2328,15 +2328,6 @@ static inline void ext4_unlock_group(struct super_block *sb,
        spin_unlock(ext4_group_lock_ptr(sb, group));
 }
 
-static inline void ext4_mark_super_dirty(struct super_block *sb)
-{
-       struct ext4_super_block *es = EXT4_SB(sb)->s_es;
-
-       ext4_superblock_csum_set(sb, es);
-       if (EXT4_SB(sb)->s_journal == NULL)
-               sb->s_dirt =1;
-}
-
 /*
  * Block validity checking
  */

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 1c81509f5bd9ec9f0090522cd2f096a9b62e9fae..f77e795fed655aa1d2e06e2c5d4e4709feef4068 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -244,9 +244,21 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
                path.dentry = mnt->mnt_root;
                cp = d_path(&path, buf, sizeof(buf));
                if (!IS_ERR(cp)) {
+                       handle_t *handle;
+                       int err;
+
+                       handle = ext4_journal_start_sb(sb, 1);
+                       if (IS_ERR(handle))
+                               return PTR_ERR(handle);
+                       err = ext4_journal_get_write_access(handle, sbi->s_sbh);
+                       if (err) {
+                               ext4_journal_stop(handle);
+                               return err;
+                       }
                        strlcpy(sbi->s_es->s_last_mounted, cp,
                                sizeof(sbi->s_es->s_last_mounted));
-                       ext4_mark_super_dirty(sb);
+                       ext4_handle_dirty_super(handle, sb);
+                       ext4_journal_stop(handle);
                }
        }
        /*