From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Tue, 17 Aug 2021 19:03:53 +0000 (-0400)
Subject: bcachefs: Fix a valgrind conditional jump
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8ddef4d6ccedcd571c9b81f6cd8dff8ddcdb918a;p=linux.git

bcachefs: Fix a valgrind conditional jump

Valgrind was complaining about a jump depending on uninitialized memory
- we weren't, but this change makes the code less confusing for valgrind
to follow.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
---

diff --git a/fs/bcachefs/varint.c b/fs/bcachefs/varint.c
index 6955ff5dc19cc..e87da470c5812 100644
--- a/fs/bcachefs/varint.c
+++ b/fs/bcachefs/varint.c
@@ -97,7 +97,7 @@ int bch2_varint_encode_fast(u8 *out, u64 v)
 int bch2_varint_decode_fast(const u8 *in, const u8 *end, u64 *out)
 {
 	u64 v = get_unaligned_le64(in);
-	unsigned bytes = ffz(v & 255) + 1;
+	unsigned bytes = ffz(*in) + 1;
 
 	if (unlikely(in + bytes > end))
 		return -1;