Merge pull request ceph#55348 from chenyuanrun/fix-io-ctx-impl-flags

yuriw · web-flow · commit e6d2e6c44c07 · 2024-03-21T07:48:01.000-07:00
librados: use CEPH_OSD_FLAG_FULL_FORCE for IoCtxImpl::remove

Reviewed-by: Radoslaw Zarzynski &lt;rzarzyns@redhat.com&gt;
Reviewed-by: Ilya Dryomov &lt;idryomov@redhat.com&gt;
diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc
@@ -1235,7 +1235,7 @@ int librados::IoCtxImpl::remove(const object_t& oid)
   ::ObjectOperation op;
   prepare_assert_ops(&op);
   op.remove();
-  return operate(oid, &op, nullptr, librados::OPERATION_FULL_FORCE);
+  return operate(oid, &op, nullptr, CEPH_OSD_FLAG_FULL_FORCE);
 }
 
 int librados::IoCtxImpl::remove(const object_t& oid, int flags)

Original file line number	Diff line number	Diff line change
`@@ -1235,7 +1235,7 @@ int librados::IoCtxImpl::remove(const object_t& oid)`
`1235`	`1235`	`::ObjectOperation op;`
`1236`	`1236`	`prepare_assert_ops(&op);`
`1237`	`1237`	`op.remove();`
`1238`		`- return operate(oid, &op, nullptr, librados::OPERATION_FULL_FORCE);`
	`1238`	`+ return operate(oid, &op, nullptr, CEPH_OSD_FLAG_FULL_FORCE);`
`1239`	`1239`	`}`
`1240`	`1240`
`1241`	`1241`	`int librados::IoCtxImpl::remove(const object_t& oid, int flags)`