From: Filipe Manana Date: Wed, 19 Nov 2025 13:01:20 +0000 (+0000) Subject: btrfs: remove root argument from btrfs_del_dir_entries_in_log() X-Git-Tag: v6.19-rc1~167^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1361f7d8da3eb5a63ce520754d3e8c2db5790e7c;p=thirdparty%2Fkernel%2Flinux.git 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: Qu Wenruo Reviewed-by: Johannes Thumshirn Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8e13117eca161..554bd03c9f216 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4363,7 +4363,7 @@ skip_backref: */ 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); } /* diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index cc27f87c4904f..c2e45e64ab6c2 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -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; diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h index 4f149d7d4fdee..a0aeec2448c0f 100644 --- a/fs/btrfs/tree-log.h +++ b/fs/btrfs/tree-log.h @@ -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,