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

Commit 41d0bd3b authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Drop delayed_refs argument from btrfs_check_delayed_seq 



It's used to print its pointer in a debug statement but doesn't really
bring any useful information to the error message.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c065f5b1

fs/btrfs/delayed-ref.c

+3 −6
Original line number Diff line number Diff line
@@ -323,9 +323,7 @@ void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans, 
	}

}



int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info,

			    struct btrfs_delayed_ref_root *delayed_refs,

			    u64 seq)

int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, u64 seq)

{

	struct seq_list *elem;

	int ret = 0;
@@ -336,10 +334,9 @@ int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, 
					struct seq_list, list);

		if (seq >= elem->seq) {

			btrfs_debug(fs_info,

				"holding back delayed_ref %#x.%x, lowest is %#x.%x (%p)",

				"holding back delayed_ref %#x.%x, lowest is %#x.%x",

				(u32)(seq >> 32), (u32)seq,

				(u32)(elem->seq >> 32), (u32)elem->seq,

				delayed_refs);

				(u32)(elem->seq >> 32), (u32)elem->seq);

			ret = 1;

		}

	}

fs/btrfs/delayed-ref.h

+1 −3
Original line number Diff line number Diff line
@@ -269,9 +269,7 @@ static inline void btrfs_delayed_ref_unlock(struct btrfs_delayed_ref_head *head) 
struct btrfs_delayed_ref_head *

btrfs_select_ref_head(struct btrfs_trans_handle *trans);



int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info,

			    struct btrfs_delayed_ref_root *delayed_refs,

			    u64 seq);

int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, u64 seq);



/*

 * helper functions to cast a node into its container

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -2713,7 +2713,7 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, 
		ref = select_delayed_ref(locked_ref);



		if (ref && ref->seq &&

		    btrfs_check_delayed_seq(fs_info, delayed_refs, ref->seq)) {

		    btrfs_check_delayed_seq(fs_info, ref->seq)) {

			spin_unlock(&locked_ref->lock);

			unselect_delayed_ref_head(delayed_refs, locked_ref);

			locked_ref = NULL;