ext4: remove unused argument from ext4_(inc|dec)_count (15ed2851) · Commits · 戴 / test

fs/ext4/namei.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -2554,7 +2554,7 @@ out:
		* for checking S_ISDIR(inode) (since the INODE_INDEX feature will not be set
		* on regular files) and to avoid creating huge/slow non-HTREE directories.
		*/
		static void ext4_inc_count(handle_t handle, struct inode inode)
		static void ext4_inc_count(struct inode *inode)
		{
		inc_nlink(inode);
		if (is_dx(inode) &&
		@@ -2566,7 +2566,7 @@ static void ext4_inc_count(handle_t handle, struct inode inode)
		* If a directory had nlink == 1, then we should let it be 1. This indicates
		* directory has >EXT4_LINK_MAX subdirs.
		*/
		static void ext4_dec_count(handle_t handle, struct inode inode)
		static void ext4_dec_count(struct inode *inode)
		{
		if (!S_ISDIR(inode->i_mode) \|\| inode->i_nlink > 2)
		drop_nlink(inode);
		@@ -2825,7 +2825,7 @@ out_clear_inode:
		iput(inode);
		goto out_retry;
		}
		ext4_inc_count(handle, dir);
		ext4_inc_count(dir);
		ext4_update_dx_flag(dir);
		err = ext4_mark_inode_dirty(handle, dir);
		if (err)
		@@ -3163,7 +3163,7 @@ static int ext4_rmdir(struct inode dir, struct dentry dentry)
		retval = ext4_mark_inode_dirty(handle, inode);
		if (retval)
		goto end_rmdir;
		ext4_dec_count(handle, dir);
		ext4_dec_count(dir);
		ext4_update_dx_flag(dir);
		retval = ext4_mark_inode_dirty(handle, dir);

		@@ -3434,7 +3434,7 @@ retry:
		ext4_handle_sync(handle);

		inode->i_ctime = current_time(inode);
		ext4_inc_count(handle, inode);
		ext4_inc_count(inode);
		ihold(inode);

		err = ext4_add_entry(handle, dentry, inode);
		@@ -3631,9 +3631,9 @@ static void ext4_update_dir_count(handle_t handle, struct ext4_renament ent)
		{
		if (ent->dir_nlink_delta) {
		if (ent->dir_nlink_delta == -1)
		ext4_dec_count(handle, ent->dir);
		ext4_dec_count(ent->dir);
		else
		ext4_inc_count(handle, ent->dir);
		ext4_inc_count(ent->dir);
		ext4_mark_inode_dirty(handle, ent->dir);
		}
		}
		@@ -3845,7 +3845,7 @@ static int ext4_rename(struct inode old_dir, struct dentry old_dentry,
		}

		if (new.inode) {
		ext4_dec_count(handle, new.inode);
		ext4_dec_count(new.inode);
		new.inode->i_ctime = current_time(new.inode);
		}
		old.dir->i_ctime = old.dir->i_mtime = current_time(old.dir);
		@@ -3855,14 +3855,14 @@ static int ext4_rename(struct inode old_dir, struct dentry old_dentry,
		if (retval)
		goto end_rename;

		ext4_dec_count(handle, old.dir);
		ext4_dec_count(old.dir);
		if (new.inode) {
		/* checked ext4_empty_dir above, can't have another
		* parent, ext4_dec_count() won't work for many-linked
		* dirs */
		clear_nlink(new.inode);
		} else {
		ext4_inc_count(handle, new.dir);
		ext4_inc_count(new.dir);
		ext4_update_dx_flag(new.dir);
		retval = ext4_mark_inode_dirty(handle, new.dir);
		if (unlikely(retval))

Admin message