marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: kerncompat: rename swap to __swap 

The 'swap' is too generic and clashes with some userspace tools that
compile against btrfs, eg. snapper when including
boost::smart_ptr::scoped_array after kerncompat.h:

  /usr/include/boost/smart_ptr/scoped_array.hpp:127:13: error: macro "swap" requires 2 arguments, but only 1 given
  a.swap(b);

Signed-off-by: David Sterba <dsterba@suse.com>
master
David Sterba 2018-11-13 13:28:09 +01:00
parent 01e35d9f53
commit d96671ae54
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
delayed-ref.c
View File

@ -201,7 +201,7 @@ static bool merge_ref(struct btrfs_trans_handle *trans,
mod = next->ref_mod;
} else {
if (ref->ref_mod < next->ref_mod) {
swap(ref, next);
__swap(ref, next);
done = true;
}
mod = -next->ref_mod;

4
kerncompat.h
View File

@ -266,11 +266,11 @@ static inline int IS_ERR_OR_NULL(const void *ptr)
#define div_u64(x, y) ((x) / (y))
/**
* swap - swap values of @a and @b
* __swap - swap values of @a and @b
* @a: first value
* @b: second value
*/
#define swap(a, b) \
#define __swap(a, b) \
do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
/*