Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>

authored by

Artem Bityutskiy and committed by
Theodore Ts'o
b50924c2 4d47603d

+7 -11
+1 -2
fs/ext4/ext4_jbd2.c
··· 138 138 } 139 139 140 140 int __ext4_handle_dirty_super(const char *where, unsigned int line, 141 - handle_t *handle, struct super_block *sb, 142 - int now) 141 + handle_t *handle, struct super_block *sb) 143 142 { 144 143 struct buffer_head *bh = EXT4_SB(sb)->s_sbh; 145 144 int err = 0;
+2 -5
fs/ext4/ext4_jbd2.h
··· 219 219 struct buffer_head *bh); 220 220 221 221 int __ext4_handle_dirty_super(const char *where, unsigned int line, 222 - handle_t *handle, struct super_block *sb, 223 - int now); 222 + handle_t *handle, struct super_block *sb); 224 223 225 224 #define ext4_journal_get_write_access(handle, bh) \ 226 225 __ext4_journal_get_write_access(__func__, __LINE__, (handle), (bh)) ··· 231 232 #define ext4_handle_dirty_metadata(handle, inode, bh) \ 232 233 __ext4_handle_dirty_metadata(__func__, __LINE__, (handle), (inode), \ 233 234 (bh)) 234 - #define ext4_handle_dirty_super_now(handle, sb) \ 235 - __ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb), 1) 236 235 #define ext4_handle_dirty_super(handle, sb) \ 237 - __ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb), 0) 236 + __ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb)) 238 237 239 238 handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks); 240 239 int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle);
+1 -1
fs/ext4/inode.c
··· 4093 4093 EXT4_SET_RO_COMPAT_FEATURE(sb, 4094 4094 EXT4_FEATURE_RO_COMPAT_LARGE_FILE); 4095 4095 ext4_handle_sync(handle); 4096 - err = ext4_handle_dirty_super_now(handle, sb); 4096 + err = ext4_handle_dirty_super(handle, sb); 4097 4097 } 4098 4098 } 4099 4099 raw_inode->i_generation = cpu_to_le32(inode->i_generation);
+2 -2
fs/ext4/namei.c
··· 2397 2397 /* Insert this inode at the head of the on-disk orphan list... */ 2398 2398 NEXT_ORPHAN(inode) = le32_to_cpu(EXT4_SB(sb)->s_es->s_last_orphan); 2399 2399 EXT4_SB(sb)->s_es->s_last_orphan = cpu_to_le32(inode->i_ino); 2400 - err = ext4_handle_dirty_super_now(handle, sb); 2400 + err = ext4_handle_dirty_super(handle, sb); 2401 2401 rc = ext4_mark_iloc_dirty(handle, inode, &iloc); 2402 2402 if (!err) 2403 2403 err = rc; ··· 2470 2470 if (err) 2471 2471 goto out_brelse; 2472 2472 sbi->s_es->s_last_orphan = cpu_to_le32(ino_next); 2473 - err = ext4_handle_dirty_super_now(handle, inode->i_sb); 2473 + err = ext4_handle_dirty_super(handle, inode->i_sb); 2474 2474 } else { 2475 2475 struct ext4_iloc iloc2; 2476 2476 struct inode *i_prev =
+1 -1
fs/ext4/resize.c
··· 798 798 ext4_kvfree(o_group_desc); 799 799 800 800 le16_add_cpu(&es->s_reserved_gdt_blocks, -1); 801 - err = ext4_handle_dirty_super_now(handle, sb); 801 + err = ext4_handle_dirty_super(handle, sb); 802 802 if (err) 803 803 ext4_std_error(sb, err); 804 804