1 --- ceph-12.2.13/src/osd/PrimaryLogPG.cc.orig 2020-01-30 21:52:36.000000000 +0100
2 +++ ceph-12.2.13/src/osd/PrimaryLogPG.cc 2020-05-28 12:18:59.914600378 +0200
4 if (limit != eversion_t() &&
6 pg_log.get_log().approx_size() > target) {
7 - size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
8 + size_t num_to_trim = std::min(static_cast<uint64_t>(pg_log.get_log().approx_size() - target),
9 cct->_conf->osd_pg_log_trim_max);
10 if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
11 cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) {
13 pg_log.get_log().approx_size() > target) {
14 dout(10) << __func__ << " approx pg log length = "
15 << pg_log.get_log().approx_size() << dendl;
16 - size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
17 + size_t num_to_trim = std::min(static_cast<uint64_t>(pg_log.get_log().approx_size() - target),
18 cct->_conf->osd_pg_log_trim_max);
19 dout(10) << __func__ << " num_to_trim = " << num_to_trim << dendl;
20 if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
21 --- ceph-12.2.13/src/os/filestore/FileStore.h.orig 2020-01-30 21:52:36.000000000 +0100
22 +++ ceph-12.2.13/src/os/filestore/FileStore.h 2020-06-03 14:29:43.325143770 +0200
25 #if defined(__linux__)
26 # ifndef BTRFS_SUPER_MAGIC
27 -#define BTRFS_SUPER_MAGIC 0x9123683EL
28 +#define BTRFS_SUPER_MAGIC 0x9123683EUL
30 # ifndef XFS_SUPER_MAGIC
31 #define XFS_SUPER_MAGIC 0x58465342L
32 --- ceph-12.2.13/src/os/filestore/FileStore.cc.orig 2020-01-30 21:52:36.000000000 +0100
33 +++ ceph-12.2.13/src/os/filestore/FileStore.cc 2020-06-03 21:27:26.387210803 +0200
36 FileStoreBackend *FileStoreBackend::create(long f_type, FileStore *fs)
39 + switch (static_cast<uint32_t>(f_type)) {
40 #if defined(__linux__)
41 case BTRFS_SUPER_MAGIC:
42 return new BtrfsFileStoreBackend(fs);
44 << " (magic 0x" << std::hex << f_type << std::dec << ")"
48 + switch (static_cast<uint32_t>(f_type)) {
49 #if defined(__linux__)
50 case BTRFS_SUPER_MAGIC:
51 if (!m_disable_wbthrottle){
55 #if defined(__linux__)
56 - if (basefs.f_type == BTRFS_SUPER_MAGIC &&
57 + if (static_cast<uint32_t>(basefs.f_type) == BTRFS_SUPER_MAGIC &&
58 !g_ceph_context->check_experimental_feature_enabled("btrfs")) {
59 derr << __FUNC__ << ": deprecated btrfs support is not enabled" << dendl;
62 blk_size = st.f_bsize;
64 #if defined(__linux__)
65 - if (st.f_type == BTRFS_SUPER_MAGIC &&
66 + if (static_cast<uint32_t>(st.f_type) == BTRFS_SUPER_MAGIC &&
67 !g_ceph_context->check_experimental_feature_enabled("btrfs")) {
68 derr <<__FUNC__ << ": deprecated btrfs support is not enabled" << dendl;
72 uint32_t fs_xattr_max_value_size;
74 - switch (m_fs_type) {
75 + switch (static_cast<uint32_t>(m_fs_type)) {
76 #if defined(__linux__)
78 fs_xattr_size = cct->_conf->filestore_max_inline_xattr_size_xfs;