Skip to content

Commit

Permalink
ext4: drop sync argument of ext4_commit_super()
Browse files Browse the repository at this point in the history 
Everybody passes 1 as sync argument of ext4_commit_super(). Just drop
it.

Reviewed-by: Harshad Shirwadkar <[email protected]>
Signed-off-by: Jan Kara <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Theodore Ts'o <[email protected]>
  • Loading branch information
@jankara @tytso
jankara authored and tytso committed Dec 22, 2020
1 parent e789ca0 commit 4392fbc
Showing 1 changed file with 22 additions and 25 deletions.
47 changes: 22 additions & 25 deletions fs/ext4/super.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) \
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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, "
Expand Down Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -5515,8 +5515,7 @@ 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);
lock_buffer(sbh);
if (buffer_write_io_error(sbh) || !buffer_uptodate(sbh)) {
/*
* Oh, dear. A previous attempt to write the
Expand All @@ -5532,16 +5531,14 @@ 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));
if (buffer_write_io_error(sbh)) {
ext4_msg(sb, KERN_ERR, "I/O error while writing "
"superblock");
clear_buffer_write_io_error(sbh);
set_buffer_uptodate(sbh);
}
unlock_buffer(sbh);
error = __sync_dirty_buffer(sbh,
REQ_SYNC | (test_opt(sb, BARRIER) ? REQ_FUA : 0));
if (buffer_write_io_error(sbh)) {
ext4_msg(sb, KERN_ERR, "I/O error while writing "
"superblock");
clear_buffer_write_io_error(sbh);
set_buffer_uptodate(sbh);
}
return error;
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 4392fbc

Please sign in to comment.