]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
compression/snappy: use uint32_t to be compatible with 1.1.9
authorNathan Cutler <ncutler@suse.com>
Tue, 27 Jul 2021 13:27:58 +0000 (15:27 +0200)
committerKefu Chai <kchai@redhat.com>
Thu, 29 Jul 2021 04:13:26 +0000 (12:13 +0800)
The snappy project made the following change in snappy.h between version 1.1.8
and 1.1.9:

<   bool GetUncompressedLength(Source* source, uint32_t* result);
---
>   bool GetUncompressedLength(Source* source, uint32* result);

This causes Ceph to FTBFS with snappy 1.1.9.

Thanks to Chris Denice for bringing this to our attention via Redmine.

Fixes: https://tracker.ceph.com/issues/50934
Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/compressor/snappy/SnappyCompressor.h

index 25393f8dc1ff473c76de8da711bc99eae3dd2b6f..93206c4007bed17b8f16778d7326082348c0d8aa 100644 (file)
@@ -97,8 +97,8 @@ class SnappyCompressor : public Compressor {
     if (qat_enabled)
       return qat_accel.decompress(p, compressed_len, dst, compressor_message);
 #endif
-    snappy::uint32 res_len = 0;
     BufferlistSource source_1(p, compressed_len);
+    uint32_t res_len = 0;
     if (!snappy::GetUncompressedLength(&source_1, &res_len)) {
       return -1;
     }