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

Commit b50924c2 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by Theodore Ts'o
Browse files

ext4: remove unnecessary argument from __ext4_handle_dirty_metadata() 



The '__ext4_handle_dirty_metadata()' does not need the 'now' argument
anymore and we can kill it.

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 4d47603d

fs/ext4/ext4_jbd2.c

+1 −2
Original line number Diff line number Diff line
@@ -138,8 +138,7 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 
}



int __ext4_handle_dirty_super(const char *where, unsigned int line,

			      handle_t *handle, struct super_block *sb,

			      int now)

			      handle_t *handle, struct super_block *sb)

{

	struct buffer_head *bh = EXT4_SB(sb)->s_sbh;

	int err = 0;

fs/ext4/ext4_jbd2.h

+2 −5
Original line number Diff line number Diff line
@@ -219,8 +219,7 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, 
				 struct buffer_head *bh);



int __ext4_handle_dirty_super(const char *where, unsigned int line,

			      handle_t *handle, struct super_block *sb,

			      int now);

			      handle_t *handle, struct super_block *sb);



#define ext4_journal_get_write_access(handle, bh) \

	__ext4_journal_get_write_access(__func__, __LINE__, (handle), (bh))
@@ -232,10 +231,8 @@ 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_now(handle, sb) \

	__ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb), 1)

#define ext4_handle_dirty_super(handle, sb) \

	__ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb), 0)

	__ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb))



handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks);

int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle);

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -4093,7 +4093,7 @@ static int ext4_do_update_inode(handle_t *handle, 
			EXT4_SET_RO_COMPAT_FEATURE(sb,

					EXT4_FEATURE_RO_COMPAT_LARGE_FILE);

			ext4_handle_sync(handle);

			err = ext4_handle_dirty_super_now(handle, sb);

			err = ext4_handle_dirty_super(handle, sb);

		}

	}

	raw_inode->i_generation = cpu_to_le32(inode->i_generation);

fs/ext4/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -2397,7 +2397,7 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode) 
	/* Insert this inode at the head of the on-disk orphan list... */

	NEXT_ORPHAN(inode) = le32_to_cpu(EXT4_SB(sb)->s_es->s_last_orphan);

	EXT4_SB(sb)->s_es->s_last_orphan = cpu_to_le32(inode->i_ino);

	err = ext4_handle_dirty_super_now(handle, sb);

	err = ext4_handle_dirty_super(handle, sb);

	rc = ext4_mark_iloc_dirty(handle, inode, &iloc);

	if (!err)

		err = rc;
@@ -2470,7 +2470,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) 
		if (err)

			goto out_brelse;

		sbi->s_es->s_last_orphan = cpu_to_le32(ino_next);

		err = ext4_handle_dirty_super_now(handle, inode->i_sb);

		err = ext4_handle_dirty_super(handle, inode->i_sb);

	} else {

		struct ext4_iloc iloc2;

		struct inode *i_prev =

fs/ext4/resize.c

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, 
	ext4_kvfree(o_group_desc);



	le16_add_cpu(&es->s_reserved_gdt_blocks, -1);

	err = ext4_handle_dirty_super_now(handle, sb);

	err = ext4_handle_dirty_super(handle, sb);

	if (err)

		ext4_std_error(sb, err);