aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/tree-log.c
diff options
context:
space:
mode:
authorNikolay Borisov <n.borisov.lkml@gmail.com>2017-01-17 17:31:42 -0500
committerDavid Sterba <dsterba@suse.com>2017-02-14 09:50:56 -0500
commitdbf39ea48b869f0f481aa6a7b79c5fb68ee4adbf (patch)
tree8e41da512f6036ace54eba5cb1b15594391982dc /fs/btrfs/tree-log.c
parent684a5773f96e1885a044eb46d6361c4cd6912427 (diff)
btrfs: Make log_directory_changes take btrfs_inode
Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/tree-log.c')
-rw-r--r--fs/btrfs/tree-log.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 8d7197a0eceb..ec48628fecf7 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3450,7 +3450,7 @@ done:
3450 * key logged by this transaction. 3450 * key logged by this transaction.
3451 */ 3451 */
3452static noinline int log_directory_changes(struct btrfs_trans_handle *trans, 3452static noinline int log_directory_changes(struct btrfs_trans_handle *trans,
3453 struct btrfs_root *root, struct inode *inode, 3453 struct btrfs_root *root, struct btrfs_inode *inode,
3454 struct btrfs_path *path, 3454 struct btrfs_path *path,
3455 struct btrfs_path *dst_path, 3455 struct btrfs_path *dst_path,
3456 struct btrfs_log_ctx *ctx) 3456 struct btrfs_log_ctx *ctx)
@@ -3464,9 +3464,8 @@ again:
3464 min_key = 0; 3464 min_key = 0;
3465 max_key = 0; 3465 max_key = 0;
3466 while (1) { 3466 while (1) {
3467 ret = log_dir_items(trans, root, BTRFS_I(inode), path, 3467 ret = log_dir_items(trans, root, inode, path, dst_path, key_type,
3468 dst_path, key_type, ctx, min_key, 3468 ctx, min_key, &max_key);
3469 &max_key);
3470 if (ret) 3469 if (ret)
3471 return ret; 3470 return ret;
3472 if (max_key == (u64)-1) 3471 if (max_key == (u64)-1)
@@ -4977,8 +4976,8 @@ log_extents:
4977 } 4976 }
4978 4977
4979 if (inode_only == LOG_INODE_ALL && S_ISDIR(inode->i_mode)) { 4978 if (inode_only == LOG_INODE_ALL && S_ISDIR(inode->i_mode)) {
4980 ret = log_directory_changes(trans, root, inode, path, dst_path, 4979 ret = log_directory_changes(trans, root, BTRFS_I(inode), path,
4981 ctx); 4980 dst_path, ctx);
4982 if (ret) { 4981 if (ret) {
4983 err = ret; 4982 err = ret;
4984 goto out_unlock; 4983 goto out_unlock;