From: Kefu Chai <tchaikov@gmail.com>
Date: Sun, 10 Jul 2022 03:23:29 +0000 (+0800)
Subject: Merge pull request #46923 from rzarzynski/wip-crimson-opexec-reformat-switch
X-Git-Tag: v18.0.0~536
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d84a001d0175db8577f6c3bbb607e7abe9d9a0e9;p=ceph.git

Merge pull request #46923 from rzarzynski/wip-crimson-opexec-reformat-switch

crimson/osd: clean up the op dispatch on OpsExecuter

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
---

d84a001d0175db8577f6c3bbb607e7abe9d9a0e9
diff --cc src/crimson/osd/ops_executer.cc
index 54dffa434936,50c68b25566f..4a5b5b89d0ad
--- a/src/crimson/osd/ops_executer.cc
+++ b/src/crimson/osd/ops_executer.cc
@@@ -560,23 -559,21 +559,23 @@@ OpsExecuter::do_execute_op(OSDOp& osd_o
        // FIXME: rework needed. Move this out to do_write_op(), introduce
        // do_write_op_no_user_modify()...
        return backend.truncate(os, osd_op, txn, *osd_op_params, delta_stats);
-     }, true);
+     });
    case CEPH_OSD_OP_ZERO:
-     return do_write_op([this, &osd_op] (auto& backend, auto& os, auto& txn) {
+     return do_write_op([this, &osd_op](auto& backend, auto& os, auto& txn) {
        return backend.zero(os, osd_op, txn, *osd_op_params, delta_stats);
-     }, true);
+     });
    case CEPH_OSD_OP_SETALLOCHINT:
 -    return osd_op_errorator::now();
 +    return do_write_op([this, &osd_op](auto& backend, auto& os, auto& txn) {
 +      return backend.set_allochint(os, osd_op, txn, delta_stats);
 +    }, true);
    case CEPH_OSD_OP_SETXATTR:
-     return do_write_op([this, &osd_op] (auto& backend, auto& os, auto& txn) {
+     return do_write_op([this, &osd_op](auto& backend, auto& os, auto& txn) {
        return backend.setxattr(os, osd_op, txn, delta_stats);
-     }, true);
+     });
    case CEPH_OSD_OP_DELETE:
-     return do_write_op([this] (auto& backend, auto& os, auto& txn) {
+     return do_write_op([this](auto& backend, auto& os, auto& txn) {
        return backend.remove(os, txn, delta_stats);
-     }, true);
+     });
    case CEPH_OSD_OP_CALL:
      return this->do_op_call(osd_op);
    case CEPH_OSD_OP_STAT: