Commit 1361f7d8 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: remove root argument from btrfs_del_dir_entries_in_log() 



There's no need to pass the root as we can extract it from the directory
inode, so remove it.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 9c78fe4a

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -4363,7 +4363,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans, 
	 */

	if (!rename_ctx) {

		btrfs_del_inode_ref_in_log(trans, root, name, inode, dir_ino);

		btrfs_del_dir_entries_in_log(trans, root, name, dir, index);

		btrfs_del_dir_entries_in_log(trans, name, dir, index);

	}



	/*

fs/btrfs/tree-log.c

+1 −1
Original line number Diff line number Diff line
@@ -3900,10 +3900,10 @@ static int del_logged_dentry(struct btrfs_trans_handle *trans, 
 * or the entire directory.

 */

void btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,

				  struct btrfs_root *root,

				  const struct fscrypt_str *name,

				  struct btrfs_inode *dir, u64 index)

{

	struct btrfs_root *root = dir->root;

	BTRFS_PATH_AUTO_FREE(path);

	int ret;

fs/btrfs/tree-log.h

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ int btrfs_log_dentry_safe(struct btrfs_trans_handle *trans, 
			  struct dentry *dentry,

			  struct btrfs_log_ctx *ctx);

void btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,

				  struct btrfs_root *root,

				  const struct fscrypt_str *name,

				  struct btrfs_inode *dir, u64 index);

void btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,