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

Commit 8f682f69 authored by Dave Jones's avatar Dave Jones Committed by David Sterba
Browse files

btrfs: remove open-coded swap() in backref.c:__merge_refs 



The kernel provides a swap() that does the same thing as this code.

Signed-off-by: default avatarDave Jones <dsj@fb.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ac1407ba

fs/btrfs/backref.c

+3 −6
Original line number Diff line number Diff line
@@ -566,17 +566,14 @@ static void __merge_refs(struct list_head *head, int mode) 
		struct __prelim_ref *pos2 = pos1, *tmp;



		list_for_each_entry_safe_continue(pos2, tmp, head, list) {

			struct __prelim_ref *xchg, *ref1 = pos1, *ref2 = pos2;

			struct __prelim_ref *ref1 = pos1, *ref2 = pos2;

			struct extent_inode_elem *eie;



			if (!ref_for_same_block(ref1, ref2))

				continue;

			if (mode == 1) {

				if (!ref1->parent && ref2->parent) {

					xchg = ref1;

					ref1 = ref2;

					ref2 = xchg;

				}

				if (!ref1->parent && ref2->parent)

					swap(ref1, ref2);

			} else {

				if (ref1->parent != ref2->parent)

					continue;