]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
compressor: Better arch ifdefs for isal code 10158/head
authorDan Mick <dan.mick@redhat.com>
Tue, 26 Jul 2016 03:03:18 +0000 (20:03 -0700)
committerAlyona Kiseleva <akiselyova@mirantis.com>
Wed, 24 Aug 2016 10:16:55 +0000 (13:16 +0300)
Signed-off-by: Dan Mick <dan.mick@redhat.com>
src/compressor/zlib/ZlibCompressor.cc

index 342677d4df0d7f617fad2230ce1d73b2fb182153..0852cd89862c3cddfe9a865189037f30f628bf13 100644 (file)
@@ -99,12 +99,9 @@ int ZlibCompressor::zlib_compress(const bufferlist &in, bufferlist &out)
   return 0;
 }
 
+#if __x86_64__
 int ZlibCompressor::isal_compress(const bufferlist &in, bufferlist &out)
 {
-#if (__arm__)
-  derr << "Unsupported architecture" << dendl;
-  return -1;
-#else
   int ret;
   unsigned have;
   isal_zstream strm;
@@ -152,15 +149,19 @@ int ZlibCompressor::isal_compress(const bufferlist &in, bufferlist &out)
   }
 
   return 0;  
-#endif
 }
+#endif
 
 int ZlibCompressor::compress(const bufferlist &in, bufferlist &out)
 {
+#if __x86_64__
   if (isal_enabled)
     return isal_compress(in, out);
   else
     return zlib_compress(in, out);
+#else
+  return zlib_compress(in, out);
+#endif
 }
 
 int ZlibCompressor::decompress(bufferlist::iterator &p, size_t compressed_size, bufferlist &out)