Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bda32530 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: fold ext4_sync_fs_nojournal() into ext4_sync_fs() 



This allows us to eliminate duplicate code, and eventually allow us to
also fold ext4_sops and ext4_nojournal_sops together.

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 279bf6d3

fs/ext4/super.c

+13 −23
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ static void ext4_mark_recovery_complete(struct super_block *sb, 
static void ext4_clear_journal_err(struct super_block *sb,

				   struct ext4_super_block *es);

static int ext4_sync_fs(struct super_block *sb, int wait);

static int ext4_sync_fs_nojournal(struct super_block *sb, int wait);

static int ext4_remount(struct super_block *sb, int *flags, char *data);

static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf);

static int ext4_unfreeze(struct super_block *sb);
@@ -1131,7 +1130,7 @@ static const struct super_operations ext4_nojournal_sops = { 
	.dirty_inode	= ext4_dirty_inode,

	.drop_inode	= ext4_drop_inode,

	.evict_inode	= ext4_evict_inode,

	.sync_fs	= ext4_sync_fs_nojournal,

	.sync_fs	= ext4_sync_fs,

	.put_super	= ext4_put_super,

	.statfs		= ext4_statfs,

	.remount_fs	= ext4_remount,
@@ -4718,6 +4717,7 @@ static int ext4_sync_fs(struct super_block *sb, int wait) 
	 * being sent at the end of the function. But we can skip it if

	 * transaction_commit will do it for us.

	 */

	if (sbi->s_journal) {

		target = jbd2_get_latest_transaction(sbi->s_journal);

		if (wait && sbi->s_journal->j_flags & JBD2_BARRIER &&

		    !jbd2_trans_will_send_data_barrier(sbi->s_journal, target))
@@ -4725,8 +4725,11 @@ static int ext4_sync_fs(struct super_block *sb, int wait) 


		if (jbd2_journal_start_commit(sbi->s_journal, &target)) {

			if (wait)

			ret = jbd2_log_wait_commit(sbi->s_journal, target);

				ret = jbd2_log_wait_commit(sbi->s_journal,

							   target);

		}

	} else if (wait && test_opt(sb, BARRIER))

		needs_barrier = true;

	if (needs_barrier) {

		int err;

		err = blkdev_issue_flush(sb->s_bdev, GFP_KERNEL, NULL);
@@ -4737,19 +4740,6 @@ static int ext4_sync_fs(struct super_block *sb, int wait) 
	return ret;

}



static int ext4_sync_fs_nojournal(struct super_block *sb, int wait)

{

	int ret = 0;



	trace_ext4_sync_fs(sb, wait);

	flush_workqueue(EXT4_SB(sb)->rsv_conversion_wq);

	dquot_writeback_dquots(sb, -1);

	if (wait && test_opt(sb, BARRIER))

		ret = blkdev_issue_flush(sb->s_bdev, GFP_KERNEL, NULL);



	return ret;

}



/*

 * LVM calls this function before a (read-only) snapshot is created.  This

 * gives us a chance to flush the journal completely and mark the fs clean.