diff options
| -rw-r--r-- | delayed-ref.c | 2 | ||||
| -rw-r--r-- | kerncompat.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/delayed-ref.c b/delayed-ref.c index e8123436..9974dbbd 100644 --- a/delayed-ref.c +++ b/delayed-ref.c @@ -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; diff --git a/kerncompat.h b/kerncompat.h index c33e485f..08133164 100644 --- a/kerncompat.h +++ b/kerncompat.h @@ -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) /* |