Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 684a5773 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Make log_dir_items take btrfs_inode 



Signed-off-by: default avatarNikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 9d122629

fs/btrfs/tree-log.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -3260,7 +3260,7 @@ static noinline int insert_dir_log_key(struct btrfs_trans_handle *trans, 
 * to replay anything deleted before the fsync

 * to replay anything deleted before the fsync

 */

 */

static noinline int log_dir_items(struct btrfs_trans_handle *trans,

static noinline int log_dir_items(struct btrfs_trans_handle *trans,

			  struct btrfs_root *root, struct inode *inode,

			  struct btrfs_root *root, struct btrfs_inode *inode,

			  struct btrfs_path *path,

			  struct btrfs_path *path,

			  struct btrfs_path *dst_path, int key_type,

			  struct btrfs_path *dst_path, int key_type,

			  struct btrfs_log_ctx *ctx,

			  struct btrfs_log_ctx *ctx,
@@ -3275,7 +3275,7 @@ static noinline int log_dir_items(struct btrfs_trans_handle *trans, 
	int nritems;

	int nritems;

	u64 first_offset = min_offset;

	u64 first_offset = min_offset;

	u64 last_offset = (u64)-1;

	u64 last_offset = (u64)-1;

	u64 ino = btrfs_ino(BTRFS_I(inode));

	u64 ino = btrfs_ino(inode);





	log = root->log_root;

	log = root->log_root;
@@ -3464,7 +3464,7 @@ static noinline int log_directory_changes(struct btrfs_trans_handle *trans, 
	min_key = 0;

	min_key = 0;

	max_key = 0;

	max_key = 0;

	while (1) {

	while (1) {

		ret = log_dir_items(trans, root, inode, path,

		ret = log_dir_items(trans, root, BTRFS_I(inode), path,

				    dst_path, key_type, ctx, min_key,

				    dst_path, key_type, ctx, min_key,

				    &max_key);

				    &max_key);

		if (ret)

		if (ret)