Commit 8786a6d7 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

btrfs: remove the root argument from log_new_dir_dentries()

There's no point in passing a root argument to log_new_dir_dentries()
because it always corresponds to the root of the given inode. So remove
it and extract the root from the given inode.
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 04fc7d51
...@@ -6109,10 +6109,10 @@ struct btrfs_dir_list { ...@@ -6109,10 +6109,10 @@ struct btrfs_dir_list {
* do_overwrite_item()). * do_overwrite_item()).
*/ */
static int log_new_dir_dentries(struct btrfs_trans_handle *trans, static int log_new_dir_dentries(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct btrfs_inode *start_inode, struct btrfs_inode *start_inode,
struct btrfs_log_ctx *ctx) struct btrfs_log_ctx *ctx)
{ {
struct btrfs_root *root = start_inode->root;
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_fs_info *fs_info = root->fs_info;
struct btrfs_path *path; struct btrfs_path *path;
LIST_HEAD(dir_list); LIST_HEAD(dir_list);
...@@ -6339,7 +6339,7 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans, ...@@ -6339,7 +6339,7 @@ static int btrfs_log_all_parents(struct btrfs_trans_handle *trans,
ret = btrfs_log_inode(trans, BTRFS_I(dir_inode), ret = btrfs_log_inode(trans, BTRFS_I(dir_inode),
LOG_INODE_ALL, ctx); LOG_INODE_ALL, ctx);
if (!ret && ctx->log_new_dentries) if (!ret && ctx->log_new_dentries)
ret = log_new_dir_dentries(trans, root, ret = log_new_dir_dentries(trans,
BTRFS_I(dir_inode), ctx); BTRFS_I(dir_inode), ctx);
btrfs_add_delayed_iput(dir_inode); btrfs_add_delayed_iput(dir_inode);
if (ret) if (ret)
...@@ -6654,7 +6654,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, ...@@ -6654,7 +6654,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
goto end_trans; goto end_trans;
if (log_dentries) if (log_dentries)
ret = log_new_dir_dentries(trans, root, inode, ctx); ret = log_new_dir_dentries(trans, inode, ctx);
else else
ret = 0; ret = 0;
end_trans: end_trans:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment