Skip to content

Commit c3a4c9b

Browse files
committed
Revert: "crimson/osd/ops_executer: prevent access to null pointers caused by gcc bug"
This reverts commit b5665cf. Signed-off-by: Matan Breizman <[email protected]>
1 parent f15b35d commit c3a4c9b

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

src/crimson/osd/ops_executer.cc

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -867,19 +867,9 @@ OpsExecuter::flush_changes_and_submit(
867867
if (auto log_rit = log_entries.rbegin(); log_rit != log_entries.rend()) {
868868
ceph_assert(log_rit->version == osd_op_params->at_version);
869869
}
870-
871-
/*
872-
* This works around the gcc bug causing the generated code to incorrectly
873-
* execute unconditionally before the predicate.
874-
*
875-
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101244
876-
*/
877-
auto clone_obc = cloning_ctx
878-
? std::move(cloning_ctx->clone_obc)
879-
: nullptr;
880870
auto [_submitted, _all_completed] = co_await pg->submit_transaction(
881871
std::move(obc),
882-
std::move(clone_obc),
872+
cloning_ctx ? std::move(cloning_ctx->clone_obc) : nullptr,
883873
std::move(txn),
884874
std::move(*osd_op_params),
885875
std::move(log_entries)

0 commit comments

Comments
 (0)