Commit 4392fbc4 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: drop sync argument of ext4_commit_super() 



Everybody passes 1 as sync argument of ext4_commit_super(). Just drop
it.

Reviewed-by: default avatarHarshad Shirwadkar <harshadshirwadkar@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20201216101844.22917-3-jack@suse.cz


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

fs/ext4/super.c

+22 −25
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static struct ratelimit_state ext4_mount_msg_ratelimit; 
static int ext4_load_journal(struct super_block *, struct ext4_super_block *,

			     unsigned long journal_devnum);

static int ext4_show_options(struct seq_file *seq, struct dentry *root);

static int ext4_commit_super(struct super_block *sb, int sync);

static int ext4_commit_super(struct super_block *sb);

static int ext4_mark_recovery_complete(struct super_block *sb,

					struct ext4_super_block *es);

static int ext4_clear_journal_err(struct super_block *sb,
@@ -621,7 +621,7 @@ static void save_error_info(struct super_block *sb, int error, 
{

	__save_error_info(sb, error, ino, block, func, line);

	if (!bdev_read_only(sb->s_bdev))

		ext4_commit_super(sb, 1);

		ext4_commit_super(sb);

}



/* Deal with the reporting of failure conditions on a filesystem such as
@@ -686,7 +686,7 @@ static void flush_stashed_error_work(struct work_struct *work) 
	struct ext4_sb_info *sbi = container_of(work, struct ext4_sb_info,

						s_error_work);



	ext4_commit_super(sbi->s_sb, 1);

	ext4_commit_super(sbi->s_sb);

}



#define ext4_error_ratelimit(sb)					\
@@ -1152,7 +1152,7 @@ static void ext4_put_super(struct super_block *sb) 
		es->s_state = cpu_to_le16(sbi->s_mount_state);

	}

	if (!sb_rdonly(sb))

		ext4_commit_super(sb, 1);

		ext4_commit_super(sb);



	rcu_read_lock();

	group_desc = rcu_dereference(sbi->s_group_desc);
@@ -2642,7 +2642,7 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es, 
	if (sbi->s_journal)

		ext4_set_feature_journal_needs_recovery(sb);



	err = ext4_commit_super(sb, 1);

	err = ext4_commit_super(sb);

done:

	if (test_opt(sb, DEBUG))

		printk(KERN_INFO "[EXT4 FS bs=%lu, gc=%u, "
@@ -4869,7 +4869,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	if (DUMMY_ENCRYPTION_ENABLED(sbi) && !sb_rdonly(sb) &&

	    !ext4_has_feature_encrypt(sb)) {

		ext4_set_feature_encrypt(sb);

		ext4_commit_super(sb, 1);

		ext4_commit_super(sb);

	}



	/*
@@ -5424,7 +5424,7 @@ static int ext4_load_journal(struct super_block *sb, 
		es->s_journal_dev = cpu_to_le32(journal_devnum);



		/* Make sure we flush the recovery flag to disk. */

		ext4_commit_super(sb, 1);

		ext4_commit_super(sb);

	}



	return 0;
@@ -5434,7 +5434,7 @@ static int ext4_load_journal(struct super_block *sb, 
	return err;

}



static int ext4_commit_super(struct super_block *sb, int sync)

static int ext4_commit_super(struct super_block *sb)

{

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_super_block *es = EXT4_SB(sb)->s_es;
@@ -5515,7 +5515,6 @@ static int ext4_commit_super(struct super_block *sb, int sync) 


	BUFFER_TRACE(sbh, "marking dirty");

	ext4_superblock_csum_set(sb);

	if (sync)

	lock_buffer(sbh);

	if (buffer_write_io_error(sbh) || !buffer_uptodate(sbh)) {

		/*
@@ -5532,7 +5531,6 @@ static int ext4_commit_super(struct super_block *sb, int sync) 
		set_buffer_uptodate(sbh);

	}

	mark_buffer_dirty(sbh);

	if (sync) {

	unlock_buffer(sbh);

	error = __sync_dirty_buffer(sbh,

		REQ_SYNC | (test_opt(sb, BARRIER) ? REQ_FUA : 0));
@@ -5542,7 +5540,6 @@ static int ext4_commit_super(struct super_block *sb, int sync) 
		clear_buffer_write_io_error(sbh);

		set_buffer_uptodate(sbh);

	}

	}

	return error;

}
@@ -5572,7 +5569,7 @@ static int ext4_mark_recovery_complete(struct super_block *sb, 


	if (ext4_has_feature_journal_needs_recovery(sb) && sb_rdonly(sb)) {

		ext4_clear_feature_journal_needs_recovery(sb);

		ext4_commit_super(sb, 1);

		ext4_commit_super(sb);

	}

out:

	jbd2_journal_unlock_updates(journal);
@@ -5614,7 +5611,7 @@ static int ext4_clear_journal_err(struct super_block *sb, 


		EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS;

		es->s_state |= cpu_to_le16(EXT4_ERROR_FS);

		ext4_commit_super(sb, 1);

		ext4_commit_super(sb);



		jbd2_journal_clear_err(journal);

		jbd2_journal_update_sb_errno(journal);
@@ -5716,7 +5713,7 @@ static int ext4_freeze(struct super_block *sb) 
		ext4_clear_feature_journal_needs_recovery(sb);

	}



	error = ext4_commit_super(sb, 1);

	error = ext4_commit_super(sb);

out:

	if (journal)

		/* we rely on upper layer to stop further updates */
@@ -5738,7 +5735,7 @@ static int ext4_unfreeze(struct super_block *sb) 
		ext4_set_feature_journal_needs_recovery(sb);

	}



	ext4_commit_super(sb, 1);

	ext4_commit_super(sb);

	return 0;

}
@@ -5998,7 +5995,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
	}



	if (sbi->s_journal == NULL && !(old_sb_flags & SB_RDONLY)) {

		err = ext4_commit_super(sb, 1);

		err = ext4_commit_super(sb);

		if (err)

			goto restore_opts;

	}