[PATCH v1 6/9] ext4: introduce __ext4_mark_super_dirty

[Artem Bityutskiy]

From: Artem Bityutskiy <artem.bityutskiy@xxxxxxxxxxxxxxx>

Introduce another superblock dirtying helper: '__ext4_mark_super_dirty()' which
marks the superblock as dirty unconditionally, without checking whether we have
the superblock or not. Use this function from '__ext4_handle_dirty_super()'.

This patch is a preparation for further work. We need to have a single place
where we mark the superblock as dirty, and this place is now the
'__ext4_mark_super_dirty()' function. We intentionally make it to be non-inline
because one of the next patches will add more code there.

Note: the final goal is to get rid of the 'sync_supers()' kernel thread which
wakes up every 5 seconds and even if there is nothing to do. Thus, we are
pushing superblock management from VFS down to file-systems.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@xxxxxxxxxxxxxxx>
---
 fs/ext4/ext4.h      |    3 ++-
 fs/ext4/ext4_jbd2.c |    2 +-
 fs/ext4/super.c     |    5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 513004f..87e8376 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1931,6 +1931,7 @@ extern int ext4_group_extend(struct super_block *sb,
 extern int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count);
 
 /* super.c */
+extern void __ext4_mark_super_dirty(struct super_block *sb);
 extern void *ext4_kvmalloc(size_t size, gfp_t flags);
 extern void *ext4_kvzalloc(size_t size, gfp_t flags);
 extern void ext4_kvfree(void *ptr);
@@ -2207,7 +2208,7 @@ static inline void ext4_unlock_group(struct super_block *sb,
 static inline void ext4_mark_super_dirty(struct super_block *sb)
 {
 	if (EXT4_SB(sb)->s_journal == NULL)
-		sb->s_dirt =1;
+		__ext4_mark_super_dirty(sb);
 }
 
 /*
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index aca1790..57e5d5c 100644
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -149,6 +149,6 @@ int __ext4_handle_dirty_super(const char *where, unsigned int line,
 			ext4_journal_abort_handle(where, line, __func__,
 						  bh, handle, err);
 	} else
-		sb->s_dirt = 1;
+		__ext4_mark_super_dirty(sb);
 	return err;
 }
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index d280bb6..d9543f3 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4199,6 +4199,11 @@ static int ext4_commit_super(struct super_block *sb, int sync)
 	return error;
 }
 
+void __ext4_mark_super_dirty(struct super_block *sb)
+{
+	sb->s_dirt = 1;
+}
+
 /*
  * Have we just finished recovery?  If so, and if we are mounting (or
  * remounting) the filesystem readonly, then we will end up with a
-- 
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/