ext4: drop ext4_handle_dirty_super()
The wrapper is now useless since it does what ext4_handle_dirty_metadata() does. Just remove it. Signed-off-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20201216101844.22917-9-jack@suse.cz Signed-off-by: Theodore Ts'o <tytso@mit.edu>master
parent
dfd56c2c0c
commit
a3f5cf14ff
|
@ -372,19 +372,3 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,
|
||||||
}
|
}
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
int __ext4_handle_dirty_super(const char *where, unsigned int line,
|
|
||||||
handle_t *handle, struct super_block *sb)
|
|
||||||
{
|
|
||||||
struct buffer_head *bh = EXT4_SB(sb)->s_sbh;
|
|
||||||
int err = 0;
|
|
||||||
|
|
||||||
if (ext4_handle_valid(handle)) {
|
|
||||||
err = jbd2_journal_dirty_metadata(handle, bh);
|
|
||||||
if (err)
|
|
||||||
ext4_journal_abort_handle(where, line, __func__,
|
|
||||||
bh, handle, err);
|
|
||||||
} else
|
|
||||||
mark_buffer_dirty(bh);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
|
@ -244,9 +244,6 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,
|
||||||
handle_t *handle, struct inode *inode,
|
handle_t *handle, struct inode *inode,
|
||||||
struct buffer_head *bh);
|
struct buffer_head *bh);
|
||||||
|
|
||||||
int __ext4_handle_dirty_super(const char *where, unsigned int line,
|
|
||||||
handle_t *handle, struct super_block *sb);
|
|
||||||
|
|
||||||
#define ext4_journal_get_write_access(handle, bh) \
|
#define ext4_journal_get_write_access(handle, bh) \
|
||||||
__ext4_journal_get_write_access(__func__, __LINE__, (handle), (bh))
|
__ext4_journal_get_write_access(__func__, __LINE__, (handle), (bh))
|
||||||
#define ext4_forget(handle, is_metadata, inode, bh, block_nr) \
|
#define ext4_forget(handle, is_metadata, inode, bh, block_nr) \
|
||||||
|
@ -257,8 +254,6 @@ int __ext4_handle_dirty_super(const char *where, unsigned int line,
|
||||||
#define ext4_handle_dirty_metadata(handle, inode, bh) \
|
#define ext4_handle_dirty_metadata(handle, inode, bh) \
|
||||||
__ext4_handle_dirty_metadata(__func__, __LINE__, (handle), (inode), \
|
__ext4_handle_dirty_metadata(__func__, __LINE__, (handle), (inode), \
|
||||||
(bh))
|
(bh))
|
||||||
#define ext4_handle_dirty_super(handle, sb) \
|
|
||||||
__ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb))
|
|
||||||
|
|
||||||
handle_t *__ext4_journal_start_sb(struct super_block *sb, unsigned int line,
|
handle_t *__ext4_journal_start_sb(struct super_block *sb, unsigned int line,
|
||||||
int type, int blocks, int rsv_blocks,
|
int type, int blocks, int rsv_blocks,
|
||||||
|
|
|
@ -814,7 +814,7 @@ static int ext4_sample_last_mounted(struct super_block *sb,
|
||||||
sizeof(sbi->s_es->s_last_mounted));
|
sizeof(sbi->s_es->s_last_mounted));
|
||||||
ext4_superblock_csum_set(sb);
|
ext4_superblock_csum_set(sb);
|
||||||
unlock_buffer(sbi->s_sbh);
|
unlock_buffer(sbi->s_sbh);
|
||||||
ext4_handle_dirty_super(handle, sb);
|
ext4_handle_dirty_metadata(handle, NULL, sbi->s_sbh);
|
||||||
out_journal:
|
out_journal:
|
||||||
ext4_journal_stop(handle);
|
ext4_journal_stop(handle);
|
||||||
out:
|
out:
|
||||||
|
|
|
@ -5155,7 +5155,8 @@ static int ext4_do_update_inode(handle_t *handle,
|
||||||
ext4_superblock_csum_set(sb);
|
ext4_superblock_csum_set(sb);
|
||||||
unlock_buffer(EXT4_SB(sb)->s_sbh);
|
unlock_buffer(EXT4_SB(sb)->s_sbh);
|
||||||
ext4_handle_sync(handle);
|
ext4_handle_sync(handle);
|
||||||
err = ext4_handle_dirty_super(handle, sb);
|
err = ext4_handle_dirty_metadata(handle, NULL,
|
||||||
|
EXT4_SB(sb)->s_sbh);
|
||||||
}
|
}
|
||||||
ext4_update_inode_fsync_trans(handle, inode, need_datasync);
|
ext4_update_inode_fsync_trans(handle, inode, need_datasync);
|
||||||
out_brelse:
|
out_brelse:
|
||||||
|
|
|
@ -2988,7 +2988,7 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode)
|
||||||
mutex_unlock(&sbi->s_orphan_lock);
|
mutex_unlock(&sbi->s_orphan_lock);
|
||||||
|
|
||||||
if (dirty) {
|
if (dirty) {
|
||||||
err = ext4_handle_dirty_super(handle, sb);
|
err = ext4_handle_dirty_metadata(handle, NULL, sbi->s_sbh);
|
||||||
rc = ext4_mark_iloc_dirty(handle, inode, &iloc);
|
rc = ext4_mark_iloc_dirty(handle, inode, &iloc);
|
||||||
if (!err)
|
if (!err)
|
||||||
err = rc;
|
err = rc;
|
||||||
|
@ -3069,7 +3069,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode)
|
||||||
ext4_superblock_csum_set(inode->i_sb);
|
ext4_superblock_csum_set(inode->i_sb);
|
||||||
unlock_buffer(sbi->s_sbh);
|
unlock_buffer(sbi->s_sbh);
|
||||||
mutex_unlock(&sbi->s_orphan_lock);
|
mutex_unlock(&sbi->s_orphan_lock);
|
||||||
err = ext4_handle_dirty_super(handle, inode->i_sb);
|
err = ext4_handle_dirty_metadata(handle, NULL, sbi->s_sbh);
|
||||||
} else {
|
} else {
|
||||||
struct ext4_iloc iloc2;
|
struct ext4_iloc iloc2;
|
||||||
struct inode *i_prev =
|
struct inode *i_prev =
|
||||||
|
|
|
@ -903,7 +903,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
|
||||||
le16_add_cpu(&es->s_reserved_gdt_blocks, -1);
|
le16_add_cpu(&es->s_reserved_gdt_blocks, -1);
|
||||||
ext4_superblock_csum_set(sb);
|
ext4_superblock_csum_set(sb);
|
||||||
unlock_buffer(EXT4_SB(sb)->s_sbh);
|
unlock_buffer(EXT4_SB(sb)->s_sbh);
|
||||||
err = ext4_handle_dirty_super(handle, sb);
|
err = ext4_handle_dirty_metadata(handle, NULL, EXT4_SB(sb)->s_sbh);
|
||||||
if (err)
|
if (err)
|
||||||
ext4_std_error(sb, err);
|
ext4_std_error(sb, err);
|
||||||
return err;
|
return err;
|
||||||
|
@ -1521,7 +1521,7 @@ static int ext4_flex_group_add(struct super_block *sb,
|
||||||
|
|
||||||
ext4_update_super(sb, flex_gd);
|
ext4_update_super(sb, flex_gd);
|
||||||
|
|
||||||
err = ext4_handle_dirty_super(handle, sb);
|
err = ext4_handle_dirty_metadata(handle, NULL, sbi->s_sbh);
|
||||||
|
|
||||||
exit_journal:
|
exit_journal:
|
||||||
err2 = ext4_journal_stop(handle);
|
err2 = ext4_journal_stop(handle);
|
||||||
|
@ -1734,7 +1734,7 @@ static int ext4_group_extend_no_check(struct super_block *sb,
|
||||||
err = ext4_group_add_blocks(handle, sb, o_blocks_count, add);
|
err = ext4_group_add_blocks(handle, sb, o_blocks_count, add);
|
||||||
if (err)
|
if (err)
|
||||||
goto errout;
|
goto errout;
|
||||||
ext4_handle_dirty_super(handle, sb);
|
ext4_handle_dirty_metadata(handle, NULL, EXT4_SB(sb)->s_sbh);
|
||||||
ext4_debug("freed blocks %llu through %llu\n", o_blocks_count,
|
ext4_debug("freed blocks %llu through %llu\n", o_blocks_count,
|
||||||
o_blocks_count + add);
|
o_blocks_count + add);
|
||||||
errout:
|
errout:
|
||||||
|
@ -1891,7 +1891,7 @@ static int ext4_convert_meta_bg(struct super_block *sb, struct inode *inode)
|
||||||
ext4_superblock_csum_set(sb);
|
ext4_superblock_csum_set(sb);
|
||||||
unlock_buffer(sbi->s_sbh);
|
unlock_buffer(sbi->s_sbh);
|
||||||
|
|
||||||
err = ext4_handle_dirty_super(handle, sb);
|
err = ext4_handle_dirty_metadata(handle, NULL, sbi->s_sbh);
|
||||||
if (err) {
|
if (err) {
|
||||||
ext4_std_error(sb, err);
|
ext4_std_error(sb, err);
|
||||||
goto errout;
|
goto errout;
|
||||||
|
|
|
@ -796,7 +796,7 @@ static void ext4_xattr_update_super_block(handle_t *handle,
|
||||||
ext4_set_feature_xattr(sb);
|
ext4_set_feature_xattr(sb);
|
||||||
ext4_superblock_csum_set(sb);
|
ext4_superblock_csum_set(sb);
|
||||||
unlock_buffer(EXT4_SB(sb)->s_sbh);
|
unlock_buffer(EXT4_SB(sb)->s_sbh);
|
||||||
ext4_handle_dirty_super(handle, sb);
|
ext4_handle_dirty_metadata(handle, NULL, EXT4_SB(sb)->s_sbh);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue