From: Sun Yuechi <sunyuechi@iscas.ac.cn>
Date: Mon, 25 May 2026 07:07:04 +0000 (+0800)
Subject: compressor/zlib: fix bogus ISA-L warning on aarch64
X-Git-Tag: v21.0.1~90^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9098f49f66d844d200ac520f509ee7da862b8894;p=ceph.git

compressor/zlib: fix bogus ISA-L warning on aarch64

The guard

    #if !(__x86_64__ && defined(HAVE_NASM_X64_AVX2)) || defined(__aarch64__)

binds the negation only to the x86 half, so aarch64 (where ISA-L
is supported) always hit the warning branch.

Signed-off-by: Sun Yuechi <sunyuechi@iscas.ac.cn>
---

diff --git a/src/compressor/zlib/ZlibCompressor.cc b/src/compressor/zlib/ZlibCompressor.cc
index 685b7fc4320..b76826d6c3f 100644
--- a/src/compressor/zlib/ZlibCompressor.cc
+++ b/src/compressor/zlib/ZlibCompressor.cc
@@ -70,7 +70,9 @@ ZlibCompressor::ZlibCompressor(CephContext *cct, bool isal)
   : Compressor(COMP_ALG_ZLIB, "zlib"), isal_enabled(isal), cct(cct)
 {
 
-#if !(__x86_64__ && defined(HAVE_NASM_X64_AVX2)) || defined(__aarch64__)
+#if (__x86_64__ && defined(HAVE_NASM_X64_AVX2))
+#elif defined(__aarch64__)
+#else
   if (isal_enabled) {
     derr << "WARN: ISA-L enabled (compressor_zlib_isal=true) but not supported"
          << dendl;