ceph-types.patch

   1 --- ceph-12.2.13/src/os/filestore/FileStore.cc.orig     2020-01-30 21:52:36.000000000 +0100
   2 +++ ceph-12.2.13/src/os/filestore/FileStore.cc  2020-06-03 21:27:26.387210803 +0200
   3 @@ -922,7 +922,7 @@
   4    }
   5
   6  #if defined(__linux__)
   7 -  if (basefs.f_type == BTRFS_SUPER_MAGIC &&
   8 +  if (static_cast<uint32_t>(basefs.f_type) == BTRFS_SUPER_MAGIC &&
   9        !g_ceph_context->check_experimental_feature_enabled("btrfs")) {
  10      derr << __FUNC__ << ": deprecated btrfs support is not enabled" << dendl;
  11      goto close_fsid_fd;
  12 @@ -1208,7 +1208,7 @@
  13    blk_size = st.f_bsize;
  14
  15  #if defined(__linux__)
  16 -  if (st.f_type == BTRFS_SUPER_MAGIC &&
  17 +  if (static_cast<uint32_t>(st.f_type) == BTRFS_SUPER_MAGIC &&
  18        !g_ceph_context->check_experimental_feature_enabled("btrfs")) {
  19      derr <<__FUNC__ << ": deprecated btrfs support is not enabled" << dendl;
  20      return -EPERM;
  21 --- ceph-14.2.22/src/compressor/snappy/SnappyCompressor.h.orig  2021-06-30 00:09:10.000000000 +0200
  22 +++ ceph-14.2.22/src/compressor/snappy/SnappyCompressor.h       2022-06-11 13:56:24.966983465 +0200
  23 @@ -96,7 +96,7 @@ class SnappyCompressor : public Compress
  24      if (qat_enabled)
  25        return qat_accel.decompress(p, compressed_len, dst);
  26  #endif
  27 -    snappy::uint32 res_len = 0;
  28 +    uint32_t res_len = 0;
  29      BufferlistSource source_1(p, compressed_len);
  30      if (!snappy::GetUncompressedLength(&source_1, &res_len)) {
  31        return -1;
  32 --- ceph-14.2.22/src/os/bluestore/BlueFS.cc.orig        2021-06-30 00:09:10.000000000 +0200
  33 +++ ceph-14.2.22/src/os/bluestore/BlueFS.cc     2022-06-11 16:48:43.774306676 +0200
  34 @@ -1737,7 +1737,7 @@ int64_t BlueFS::_read_random(
  35        }
  36      } else {
  37        auto left = buf->get_buf_remaining(off);
  38 -      int64_t r = std::min(len, left);
  39 +      int64_t r = std::min<int64_t>(len, left);
  40        logger->inc(l_bluefs_read_random_buffer_count, 1);
  41        logger->inc(l_bluefs_read_random_buffer_bytes, r);
  42        dout(20) << __func__ << " left 0x" << std::hex << left
  43 --- ceph-14.2.22/src/os/bluestore/BlueStore.cc.orig     2021-06-30 00:09:10.000000000 +0200
  44 +++ ceph-14.2.22/src/os/bluestore/BlueStore.cc  2022-06-11 17:36:58.645290480 +0200
  45 @@ -5948,7 +5948,7 @@ size_t BlueStore::available_freespace(ui
  46      if (dist_to_alignment >= len)
  47        return;
  48      len -= dist_to_alignment;
  49 -    total += p2align(len, alloc_size);
  50 +    total += p2align<uint64_t>(len, alloc_size);
  51    };
  52    alloc->dump(iterated_allocation);
  53    return total;
  54 --- ceph-14.2.22/src/client/fuse_ll.cc.orig     2021-06-30 00:09:10.000000000 +0200
  55 +++ ceph-14.2.22/src/client/fuse_ll.cc  2022-06-11 20:41:03.452122291 +0200
  56 @@ -192,7 +192,7 @@ static void fuse_ll_lookup(fuse_req_t re
  57  }
  58
  59  static void fuse_ll_forget(fuse_req_t req, fuse_ino_t ino,
  60 -                          long unsigned nlookup)
  61 +                          uint64_t nlookup)
  62  {
  63    CephFuse::Handle *cfuse = fuse_ll_req_prepare(req);
  64    cfuse->client->ll_forget(cfuse->iget(ino), nlookup+1);
  65 --- ceph-15.2.16/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc.orig  2022-03-01 07:44:29.000000000 +0100
  66 +++ ceph-15.2.16/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc       2022-06-13 06:26:31.761657298 +0200
  67 @@ -253,7 +253,7 @@ bool Replayer<I>::get_replay_status(std:
  68
  69    json_spirit::mObject root_obj;
  70    root_obj["replay_state"] = replay_state;
  71 -  root_obj["remote_snapshot_timestamp"] = remote_snap_info->timestamp.sec();
  72 +  root_obj["remote_snapshot_timestamp"] = static_cast<int64_t>(remote_snap_info->timestamp.sec());
  73
  74    auto matching_remote_snap_id = util::compute_remote_snap_id(
  75      m_state_builder->local_image_ctx->image_lock,
  76 @@ -268,7 +268,7 @@ bool Replayer<I>::get_replay_status(std:
  77      // the local snapshot would just be the time the snapshot was
  78      // synced and not the consistency point in time.
  79      root_obj["local_snapshot_timestamp"] =
  80 -      matching_remote_snap_it->second.timestamp.sec();
  81 +      static_cast<int64_t>(matching_remote_snap_it->second.timestamp.sec());
  82    }
  83
  84    matching_remote_snap_it = m_state_builder->remote_image_ctx->snap_info.find(
  85 @@ -276,7 +276,7 @@ bool Replayer<I>::get_replay_status(std:
  86    if (m_remote_snap_id_end != CEPH_NOSNAP &&
  87        matching_remote_snap_it !=
  88          m_state_builder->remote_image_ctx->snap_info.end()) {
  89 -    root_obj["syncing_snapshot_timestamp"] = remote_snap_info->timestamp.sec();
  90 +    root_obj["syncing_snapshot_timestamp"] = static_cast<int64_t>(remote_snap_info->timestamp.sec());
  91      root_obj["syncing_percent"] = static_cast<uint64_t>(
  92          100 * m_local_mirror_snap_ns.last_copied_object_number /
  93          static_cast<float>(std::max<uint64_t>(1U, m_local_object_count)));
  94 --- ceph-15.2.16/src/librbd/object_map/DiffRequest.cc.orig      2022-03-01 07:44:29.000000000 +0100
  95 +++ ceph-15.2.16/src/librbd/object_map/DiffRequest.cc   2022-06-13 06:09:45.790195571 +0200
  96 @@ -187,7 +187,7 @@ void DiffRequest<I>::handle_load_object_
  97      m_object_map.resize(m_object_diff_state->size());
  98    }
  99
 100 -  uint64_t overlap = std::min(m_object_map.size(), prev_object_diff_state_size);
 101 +  uint64_t overlap = std::min<uint64_t>(m_object_map.size(), prev_object_diff_state_size);
 102    auto it = m_object_map.begin();
 103    auto overlap_end_it = it + overlap;
 104    auto diff_it = m_object_diff_state->begin();