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

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: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20201216101844.22917-9-jack@suse.cz


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

fs/ext4/ext4_jbd2.c

+0 −16
Original line number Diff line number Diff line
@@ -372,19 +372,3 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 
	}

	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;

}

fs/ext4/ext4_jbd2.h

+0 −5
Original line number Diff line number Diff line
@@ -244,9 +244,6 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 
				 handle_t *handle, struct inode *inode,

				 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) \

	__ext4_journal_get_write_access(__func__, __LINE__, (handle), (bh))

#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) \

	__ext4_handle_dirty_metadata(__func__, __LINE__, (handle), (inode), \

				     (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,

				  int type, int blocks, int rsv_blocks,

fs/ext4/file.c

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static int ext4_sample_last_mounted(struct super_block *sb, 
		sizeof(sbi->s_es->s_last_mounted));

	ext4_superblock_csum_set(sb);

	unlock_buffer(sbi->s_sbh);

	ext4_handle_dirty_super(handle, sb);

	ext4_handle_dirty_metadata(handle, NULL, sbi->s_sbh);

out_journal:

	ext4_journal_stop(handle);

out:

fs/ext4/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -5155,7 +5155,8 @@ static int ext4_do_update_inode(handle_t *handle, 
		ext4_superblock_csum_set(sb);

		unlock_buffer(EXT4_SB(sb)->s_sbh);

		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);

out_brelse:

fs/ext4/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -2988,7 +2988,7 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode) 
	mutex_unlock(&sbi->s_orphan_lock);



	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);

		if (!err)

			err = rc;
@@ -3069,7 +3069,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) 
		ext4_superblock_csum_set(inode->i_sb);

		unlock_buffer(sbi->s_sbh);

		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 {

		struct ext4_iloc iloc2;

		struct inode *i_prev =