summaryrefslogtreecommitdiffstats
path: root/recipes-extended/ceph/ceph/0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-extended/ceph/ceph/0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch')
-rw-r--r--recipes-extended/ceph/ceph/0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/recipes-extended/ceph/ceph/0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch b/recipes-extended/ceph/ceph/0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch
deleted file mode 100644
index 795c60fc..00000000
--- a/recipes-extended/ceph/ceph/0001-kv-rocksdb_cache-drop-ROCKSDB_PRIszt.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From b7b58010fd10b95c681df78cc4322e6586a39099 Mon Sep 17 00:00:00 2001
2From: Kefu Chai <kchai@redhat.com>
3Date: Tue, 17 Aug 2021 15:20:24 +0800
4Subject: [PATCH 1/6] kv/rocksdb_cache: drop ROCKSDB_PRIszt
5
6ROCKSDB_PRIszt is a macro for "zu", which is in turn use for printing an
7(unsigned) size_t variable.
8
9there is no point having it in the header file or define a macro for it,
10as %zu is standard compliant, and we don't get any advantage by using a
11macro for it.
12
13Signed-off-by: Kefu Chai <kchai@redhat.com>
14
15Upstream-Status: Backport [44f5b827eb3c65665373a86908bf5d47e7d02687]
16
17Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
18
19---
20 src/kv/rocksdb_cache/ShardedCache.cc | 2 +-
21 src/kv/rocksdb_cache/ShardedCache.h | 1 -
22 2 files changed, 1 insertion(+), 2 deletions(-)
23
24diff --git a/src/kv/rocksdb_cache/ShardedCache.cc b/src/kv/rocksdb_cache/ShardedCache.cc
25index 367140a9..8e08deb8 100644
26--- a/src/kv/rocksdb_cache/ShardedCache.cc
27+++ b/src/kv/rocksdb_cache/ShardedCache.cc
28@@ -131,7 +131,7 @@ std::string ShardedCache::GetPrintableOptions() const {
29 char buffer[kBufferSize];
30 {
31 std::lock_guard<std::mutex> l(capacity_mutex_);
32- snprintf(buffer, kBufferSize, " capacity : %" ROCKSDB_PRIszt "\n",
33+ snprintf(buffer, kBufferSize, " capacity : %zu\n",
34 capacity_);
35 ret.append(buffer);
36 snprintf(buffer, kBufferSize, " num_shard_bits : %d\n", num_shard_bits_);
37diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
38index 4d64893a..8ab2587b 100644
39--- a/src/kv/rocksdb_cache/ShardedCache.h
40+++ b/src/kv/rocksdb_cache/ShardedCache.h
41@@ -22,7 +22,6 @@
42 #ifndef CACHE_LINE_SIZE
43 #define CACHE_LINE_SIZE 64 // XXX arch-specific define
44 #endif
45-#define ROCKSDB_PRIszt "zu"
46
47 namespace rocksdb_cache {
48
49--
502.33.0
51