From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Mon, 17 Oct 2022 11:19:34 +0000 (-0400)
Subject: bcachefs: Optimize __bkey_unpack_key_format_checked()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b0c5b15cc8969f79b410a825efe9894cdec85738;p=linux.git

bcachefs: Optimize __bkey_unpack_key_format_checked()

Delete some code when CONFIG_BCACHEFS_DEBUG=n

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/bset.h b/fs/bcachefs/bset.h
index 9708b9ffa4dfc..e458d1acdef4f 100644
--- a/fs/bcachefs/bset.h
+++ b/fs/bcachefs/bset.h
@@ -212,20 +212,19 @@ __bkey_unpack_key_format_checked(const struct btree *b,
 			       struct bkey *dst,
 			       const struct bkey_packed *src)
 {
-#ifdef HAVE_BCACHEFS_COMPILED_UNPACK
-	{
+	if (IS_ENABLED(HAVE_BCACHEFS_COMPILED_UNPACK)) {
 		compiled_unpack_fn unpack_fn = b->aux_data;
 		unpack_fn(dst, src);
 
-		if (bch2_expensive_debug_checks) {
+		if (IS_ENABLED(CONFIG_BCACHEFS_DEBUG) &&
+		    bch2_expensive_debug_checks) {
 			struct bkey dst2 = __bch2_bkey_unpack_key(&b->format, src);
 
 			BUG_ON(memcmp(dst, &dst2, sizeof(*dst)));
 		}
+	} else {
+		*dst = __bch2_bkey_unpack_key(&b->format, src);
 	}
-#else
-	*dst = __bch2_bkey_unpack_key(&b->format, src);
-#endif
 }
 
 static inline struct bkey