Patchwork [1/2] ext3: optimize ext3_force_commit

login
register
mail settings
Submitter Dmitri Monakho
Date April 1, 2013, 9:03 a.m.
Message ID <1364807037-21664-1-git-send-email-dmonakhov@openvz.org>
Download mbox | patch
Permalink /patch/232684/
State Superseded
Headers show

Comments

Dmitri Monakho - April 1, 2013, 9:03 a.m.
We do not have to use journal_force_commit() because it explicitly
start and stop SYNC transaction. This is very suboptimal because the only
users of ext3_force_commit() are ext3_sync_file and ext3_write_inode().
Both functions just want to commit and wait any uncommitted transaction
similar to ext3_sync_fs().

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
 fs/ext3/super.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
Jan Kara - April 2, 2013, 1:20 p.m.
On Mon 01-04-13 13:03:56, Dmitry Monakhov wrote:
> We do not have to use journal_force_commit() because it explicitly
> start and stop SYNC transaction. This is very suboptimal because the only
> users of ext3_force_commit() are ext3_sync_file and ext3_write_inode().
> Both functions just want to commit and wait any uncommitted transaction
> similar to ext3_sync_fs().
  As Ted mentioned, you can also remove ext3_journal_force_commit(). Also
I'm somewhat curious whether you spotted some particular performance issue
with this call or whether it just seemed better to you this way. Note that
I believe your change isn't going to be worse than what we had but OTOH we
have sync transaction batching code in journal_stop() so there might be
some changes in timings.

								Honza

> Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
> ---
>  fs/ext3/super.c |   11 +++++------
>  1 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/ext3/super.c b/fs/ext3/super.c
> index fb5120a..1853031 100644
> --- a/fs/ext3/super.c
> +++ b/fs/ext3/super.c
> @@ -2507,15 +2507,14 @@ static void ext3_clear_journal_err(struct super_block *sb,
>   */
>  int ext3_force_commit(struct super_block *sb)
>  {
> -	journal_t *journal;
> -	int ret;
> +	tid_t target;
>  
>  	if (sb->s_flags & MS_RDONLY)
>  		return 0;
>  
> -	journal = EXT3_SB(sb)->s_journal;
> -	ret = ext3_journal_force_commit(journal);
> -	return ret;
> +	if (journal_start_commit(EXT3_SB(sb)->s_journal, &target))
> +		return log_wait_commit(EXT3_SB(sb)->s_journal, target);
> +	return 0;
>  }
>  
>  static int ext3_sync_fs(struct super_block *sb, int wait)
> @@ -2530,7 +2529,7 @@ static int ext3_sync_fs(struct super_block *sb, int wait)
>  	dquot_writeback_dquots(sb, -1);
>  	if (journal_start_commit(EXT3_SB(sb)->s_journal, &target)) {
>  		if (wait)
> -			log_wait_commit(EXT3_SB(sb)->s_journal, target);
> +			return log_wait_commit(EXT3_SB(sb)->s_journal, target);
>  	}
>  	return 0;
>  }
> -- 
> 1.7.1
>

Patch

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index fb5120a..1853031 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2507,15 +2507,14 @@  static void ext3_clear_journal_err(struct super_block *sb,
  */
 int ext3_force_commit(struct super_block *sb)
 {
-	journal_t *journal;
-	int ret;
+	tid_t target;
 
 	if (sb->s_flags & MS_RDONLY)
 		return 0;
 
-	journal = EXT3_SB(sb)->s_journal;
-	ret = ext3_journal_force_commit(journal);
-	return ret;
+	if (journal_start_commit(EXT3_SB(sb)->s_journal, &target))
+		return log_wait_commit(EXT3_SB(sb)->s_journal, target);
+	return 0;
 }
 
 static int ext3_sync_fs(struct super_block *sb, int wait)
@@ -2530,7 +2529,7 @@  static int ext3_sync_fs(struct super_block *sb, int wait)
 	dquot_writeback_dquots(sb, -1);
 	if (journal_start_commit(EXT3_SB(sb)->s_journal, &target)) {
 		if (wait)
-			log_wait_commit(EXT3_SB(sb)->s_journal, target);
+			return log_wait_commit(EXT3_SB(sb)->s_journal, target);
 	}
 	return 0;
 }