blob: 3b38c1708733521d483a652aaaa88f8625872de5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 4c13a798dcf2e783afd7558bf3541dc025de854a Mon Sep 17 00:00:00 2001
From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 27 Jul 2021 15:27:58 +0200
Subject: [PATCH] compression/snappy: use uint32_t to be compatible with 1.1.9
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h
index 25393f8dc1ff4..93206c4007bed 100644
--- a/src/compressor/snappy/SnappyCompressor.h
+++ b/src/compressor/snappy/SnappyCompressor.h
@@ -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;
}
|