From: Kefu Chai Date: Thu, 6 Aug 2020 10:16:58 +0000 (+0800) Subject: Merge pull request #36490 from tchaikov/wip-crimson-zero-op X-Git-Tag: v16.1.0~1500 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d2401c191c2f75d83886629463a997a87853c6b;p=ceph.git Merge pull request #36490 from tchaikov/wip-crimson-zero-op crimson/osd: support CEPH_OSD_OP_ZERO op and cls_cxx_write_zero() Reviewed-by: Radoslaw Zarzynski --- 8d2401c191c2f75d83886629463a997a87853c6b diff --cc src/crimson/osd/ops_executer.cc index 9388bd96418,d6e6fbc72d1..52d02de08b8 --- a/src/crimson/osd/ops_executer.cc +++ b/src/crimson/osd/ops_executer.cc @@@ -711,8 -713,13 +711,12 @@@ OpsExecuter::execute_osd_op(OSDOp& osd_ return do_write_op([this, &osd_op] (auto& backend, auto& os, auto& txn) { // FIXME: rework needed. Move this out to do_write_op(), introduce // do_write_op_no_user_modify()... - osd_op_params = osd_op_params_t(); return backend.truncate(os, osd_op, txn, *osd_op_params); }, true); + case CEPH_OSD_OP_ZERO: + return do_write_op([this, &osd_op] (auto& backend, auto& os, auto& txn) { + return backend.zero(os, osd_op, txn, *osd_op_params); + }, true); case CEPH_OSD_OP_SETALLOCHINT: return osd_op_errorator::now(); case CEPH_OSD_OP_SETXATTR: