update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / osd / ECTransaction.h

diff --git a/ceph/src/osd/ECTransaction.h b/ceph/src/osd/ECTransaction.h
index ff49202bf64993d5d56b1fb320dead03564a0052..ae0faf5df4de4ee172dc9720bbe0150a1ce20d72 100644 (file)
--- a/ceph/src/osd/ECTransaction.h
+++ b/ceph/src/osd/ECTransaction.h
@@ -89,7 +89,7 @@ namespace ECTransaction {
        for (auto &&extent: i.second.buffer_updates) {
          using BufferUpdate = PGTransaction::ObjectOperation::BufferUpdate;
          if (boost::get<BufferUpdate::CloneRange>(&(extent.get_val()))) {
-           assert(
+           ceph_assert(
              0 ==
              "CloneRange is not allowed, do_op should have returned ENOTSUPP");
          }
@@ -109,8 +109,8 @@ namespace ECTransaction {
          }
          if (head_start != head_finish &&
              head_start < orig_size) {
-           assert(head_finish <= orig_size);
-           assert(head_finish - head_start == sinfo.get_stripe_width());
+           ceph_assert(head_finish <= orig_size);
+           ceph_assert(head_finish - head_start == sinfo.get_stripe_width());
            ldpp_dout(dpp, 20) << __func__ << ": reading partial head stripe "
                               << head_start << "~" << sinfo.get_stripe_width()
                               << dendl;
@@ -127,8 +127,8 @@ namespace ECTransaction {
          if (tail_start != tail_finish &&
              (head_start == head_finish || tail_start != head_start) &&
              tail_start < orig_size) {
-           assert(tail_finish <= orig_size);
-           assert(tail_finish - tail_start == sinfo.get_stripe_width());
+           ceph_assert(tail_finish <= orig_size);
+           ceph_assert(tail_finish - tail_start == sinfo.get_stripe_width());
            ldpp_dout(dpp, 20) << __func__ << ": reading partial tail stripe "
                               << tail_start << "~" << sinfo.get_stripe_width()
                               << dendl;
@@ -137,7 +137,7 @@ namespace ECTransaction {
          }
 
          if (head_start != tail_finish) {
-           assert(
+           ceph_assert(
              sinfo.logical_offset_is_stripe_aligned(
                tail_finish - head_start)
              );
@@ -146,7 +146,7 @@ namespace ECTransaction {
            if (tail_finish > projected_size)
              projected_size = tail_finish;
          } else {
-           assert(tail_finish <= projected_size);
+           ceph_assert(tail_finish <= projected_size);
          }
        }
 
@@ -174,7 +174,7 @@ namespace ECTransaction {
         * to_read should have an entry for i.first iff it isn't empty
         * and if we are reading from i.first, we can't be renaming or
         * cloning it */
-       assert(plan.to_read.count(i.first) == 0 ||
+       ceph_assert(plan.to_read.count(i.first) == 0 ||
               (!plan.to_read.at(i.first).empty() &&
                !i.second.has_source()));
       });
@@ -186,7 +186,6 @@ namespace ECTransaction {
     WritePlan &plan,
     ErasureCodeInterfaceRef &ecimpl,
     pg_t pgid,
-    bool legacy_log_entries,
     const ECUtil::stripe_info_t &sinfo,
     const map<hobject_t,extent_map> &partial_extents,
     vector<pg_log_entry_t> &entries,