ceph-types.patch

   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
   3 @@ -1582,7 +1582,7 @@
   4    if (limit != eversion_t() &&
   5        limit != pg_trim_to &&
   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<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) {
  12 @@ -1628,7 +1628,7 @@
  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<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.cc.orig     2020-01-30 21:52:36.000000000 +0100
  22 +++ ceph-12.2.13/src/os/filestore/FileStore.cc  2020-06-03 21:27:26.387210803 +0200
  23 @@ -922,7 +922,7 @@
  24    }
  25
  26  #if defined(__linux__)
  27 -  if (basefs.f_type == BTRFS_SUPER_MAGIC &&
  28 +  if (static_cast<uint32_t>(basefs.f_type) == BTRFS_SUPER_MAGIC &&
  29        !g_ceph_context->check_experimental_feature_enabled("btrfs")) {
  30      derr << __FUNC__ << ": deprecated btrfs support is not enabled" << dendl;
  31      goto close_fsid_fd;
  32 @@ -1208,7 +1208,7 @@
  33    blk_size = st.f_bsize;
  34
  35  #if defined(__linux__)
  36 -  if (st.f_type == BTRFS_SUPER_MAGIC &&
  37 +  if (static_cast<uint32_t>(st.f_type) == BTRFS_SUPER_MAGIC &&
  38        !g_ceph_context->check_experimental_feature_enabled("btrfs")) {
  39      derr <<__FUNC__ << ": deprecated btrfs support is not enabled" << dendl;
  40      return -EPERM;
  41 --- ceph-13.2.10/src/mon/OSDMonitor.cc.orig     2020-04-23 18:32:31.000000000 +0200
  42 +++ ceph-13.2.10/src/mon/OSDMonitor.cc  2021-09-20 20:03:13.672134022 +0200
  43 @@ -820,7 +820,7 @@ OSDMonitor::update_pending_pgs(const OSD
  44              << " modified " << p->second.modified
  45              << " [" << p->second.start << "-" << p->second.end << ")"
  46              << dendl;
  47 -    int n = std::min(max - pending_creatings.pgs.size(),
  48 +    int n = std::min<uint64_t>(max - pending_creatings.pgs.size(),
  49                 p->second.end - p->second.start);
  50      ps_t first = p->second.start;
  51      ps_t end = first + n;
  52 --- ceph-13.2.10/src/os/bluestore/BlueStore.cc.orig     2020-04-23 18:32:31.000000000 +0200
  53 +++ ceph-13.2.10/src/os/bluestore/BlueStore.cc  2021-09-20 20:34:23.352005097 +0200
  54 @@ -12614,7 +12614,7 @@ size_t BlueStoreRepairer::StoreSpaceTrac
  55      if (e.second == 0) {
  56        continue;
  57      }
  58 -    size_t pos = max(e.first / granularity, prev_pos);
  59 +    size_t pos = max<uint64_t>(e.first / granularity, prev_pos);
  60      size_t end_pos = 1 + (e.first + e.second - 1) / granularity;
  61      while (pos != npos && pos < end_pos)  {
  62          ceph_assert( collections_bfs[pos].element_count() ==
  63 --- ceph-13.2.10/src/rgw/rgw_client_io_filters.h.orig   2020-04-23 18:32:31.000000000 +0200
  64 +++ ceph-13.2.10/src/rgw/rgw_client_io_filters.h        2021-09-22 17:02:54.573378159 +0200
  65 @@ -291,7 +291,7 @@ public:
  66        // extensions/trailing headers.
  67        char chunk_size[32];
  68        const auto chunk_size_len = snprintf(chunk_size, sizeof(chunk_size),
  69 -                                           "%" PRIx64 "\r\n", len);
  70 +                                           "%zx\r\n", len);
  71        size_t sent = 0;
  72
  73        sent += DecoratedRestfulClient<T>::send_body(chunk_size, chunk_size_len);
  74 --- ceph-13.2.10/src/rgw/rgw_rest_swift.cc.orig 2020-04-23 18:32:31.000000000 +0200
  75 +++ ceph-13.2.10/src/rgw/rgw_rest_swift.cc      2021-09-22 17:04:01.473340779 +0200
  76 @@ -726,7 +726,7 @@ static inline int handle_metadata_errors
  77    } else if (op_ret == -E2BIG) {
  78      const auto error_message = boost::str(
  79        boost::format("Too many metadata items; max %lld")
  80 -        % s->cct->_conf->get_val<size_t>("rgw_max_attrs_num_in_req"));
  81 +        % s->cct->_conf->get_val<Option::size_t>("rgw_max_attrs_num_in_req"));
  82      set_req_state_err(s, EINVAL, error_message);
  83      return -EINVAL;
  84    }
  85 @@ -1781,7 +1781,7 @@ void RGWInfo_ObjStore_SWIFT::list_swift_
  86    formatter.dump_string("version", ceph_version);
  87
  88    const size_t max_attr_name_len = \
  89 -    g_conf->get_val<size_t>("rgw_max_attr_name_len");
  90 +    g_conf->get_val<Option::size_t>("rgw_max_attr_name_len");
  91    if (max_attr_name_len) {
  92      const size_t meta_name_limit = \
  93        max_attr_name_len - strlen(RGW_ATTR_PREFIX RGW_AMZ_META_PREFIX);
  94 @@ -1794,7 +1794,7 @@ void RGWInfo_ObjStore_SWIFT::list_swift_
  95    }
  96
  97    const size_t meta_num_limit = \
  98 -    g_conf->get_val<size_t>("rgw_max_attrs_num_in_req");
  99 +    g_conf->get_val<Option::size_t>("rgw_max_attrs_num_in_req");
 100    if (meta_num_limit) {
 101      formatter.dump_int("max_meta_count", meta_num_limit);
 102    }
 103 --- ceph-13.2.10/src/common/ceph_context.h.orig 2020-04-23 18:32:31.000000000 +0200
 104 +++ ceph-13.2.10/src/common/ceph_context.h      2021-09-23 06:29:21.645156177 +0200
 105 @@ -144,7 +144,11 @@ public:
 106    void do_command(std::string_view command, const cmdmap_t& cmdmap,
 107                   std::string_view format, ceph::bufferlist *out);
 108
 109 +#ifdef __LP64__
 110    static constexpr std::size_t largest_singleton = sizeof(void*) * 72;
 111 +#else
 112 +  static constexpr std::size_t largest_singleton = sizeof(void*) * 96;
 113 +#endif
 114
 115    template<typename T, typename... Args>
 116    T& lookup_or_create_singleton_object(std::string_view name,