summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKefu Chai <kchai@redhat.com>2019-10-24 05:57:09 +0200
committerKefu Chai <kchai@redhat.com>2019-10-24 06:23:17 +0200
commitacff723c32cac5f1b5189b21a3d283b7d3cdd22a (patch)
tree2297ab2b2b1573beaa71b1afe45da161d30f987d
parentMerge pull request #31066 from ideepika/wip-doc-adds-cmake-options (diff)
downloadceph-acff723c32cac5f1b5189b21a3d283b7d3cdd22a.tar.xz
ceph-acff723c32cac5f1b5189b21a3d283b7d3cdd22a.zip
crimson/osd/osd_operation.h: s/ceph_assert/assert/
so we don't need to include `include/ceph_assert.h` for it. and presumably, `ceph_assert()` is for fail the application early when it is not able to recover from a failure, while `assert()` is for debugging. Signed-off-by: Kefu Chai <kchai@redhat.com>
-rw-r--r--src/crimson/osd/osd_operation.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crimson/osd/osd_operation.h b/src/crimson/osd/osd_operation.h
index 7ed60394ab6..6c0305a814c 100644
--- a/src/crimson/osd/osd_operation.h
+++ b/src/crimson/osd/osd_operation.h
@@ -148,7 +148,7 @@ public:
if (f.fut.available() || f.fut.failed()) {
return std::move(f.fut);
}
- ceph_assert(f.blocker);
+ assert(f.blocker);
add_blocker(f.blocker);
return std::move(f.fut).then_wrapped([this, blocker=f.blocker](auto &&arg) {
clear_blocker(blocker);