@@ -6006,7 +6006,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
60066006 object_info_t & oi = obs.oi ;
60076007 const hobject_t & soid = oi.soid ;
60086008 const bool skip_data_digest = osd->store ->has_builtin_csum () &&
6009- osd->osd_skip_data_digest ;
6009+ * osd->osd_skip_data_digest ;
60106010
60116011 PGTransaction* t = ctx->op_t .get ();
60126012
@@ -6069,9 +6069,9 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
60696069 // munge ZERO -> TRUNCATE? (don't munge to DELETE or we risk hosing attributes)
60706070 if (op.op == CEPH_OSD_OP_ZERO &&
60716071 obs.exists &&
6072- op.extent .offset < static_cast <Option:: size_t >( osd->osd_max_object_size ) &&
6072+ op.extent .offset < * osd->osd_max_object_size &&
60736073 op.extent .length >= 1 &&
6074- op.extent .length <= static_cast <Option:: size_t >( osd->osd_max_object_size ) &&
6074+ op.extent .length <= * osd->osd_max_object_size &&
60756075 op.extent .offset + op.extent .length >= oi.size ) {
60766076 if (op.extent .offset >= oi.size ) {
60776077 // no-op
@@ -6781,7 +6781,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
67816781 }
67826782 result = check_offset_and_length (
67836783 op.extent .offset , op.extent .length ,
6784- static_cast <Option:: size_t >( osd->osd_max_object_size ) , get_dpp ());
6784+ * osd->osd_max_object_size , get_dpp ());
67856785 if (result < 0 )
67866786 break ;
67876787
@@ -6838,7 +6838,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
68386838 }
68396839 result = check_offset_and_length (
68406840 0 , op.extent .length ,
6841- static_cast <Option:: size_t >( osd->osd_max_object_size ) , get_dpp ());
6841+ * osd->osd_max_object_size , get_dpp ());
68426842 if (result < 0 )
68436843 break ;
68446844
@@ -6888,7 +6888,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
68886888 { // zero
68896889 result = check_offset_and_length (
68906890 op.extent .offset , op.extent .length ,
6891- static_cast <Option:: size_t >( osd->osd_max_object_size ) , get_dpp ());
6891+ * osd->osd_max_object_size , get_dpp ());
68926892 if (result < 0 )
68936893 break ;
68946894
@@ -6953,7 +6953,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
69536953
69546954 result = check_offset_and_length (
69556955 op.extent .offset , op.extent .length ,
6956- static_cast <Option:: size_t >( osd->osd_max_object_size ) , get_dpp ());
6956+ * osd->osd_max_object_size , get_dpp ());
69576957 if (result < 0 )
69586958 break ;
69596959
0 commit comments