]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/osd: do not use __func__ in a lambda
authorKefu Chai <kchai@redhat.com>
Fri, 14 Aug 2020 13:26:21 +0000 (21:26 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 15 Aug 2020 03:09:13 +0000 (11:09 +0800)
otherwise we would have logging messages like

operator(): returning obc ...

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/osd/pg.cc

index f05d36acd68f9207215f08c747c362fa56e51319..99b79394b59e907eded54e0db663bb58b9fb4fe3 100644 (file)
@@ -815,23 +815,16 @@ PG::get_or_load_head_obc(hobject_t oid)
           std::pair<crimson::osd::ObjectContextRef, bool>>
       {
        logger().debug(
-         "{}: loaded obs {} for {}",
-         __func__,
-         md->os.oi,
-         oid);
+         "get_or_load_head_obc: loaded obs {} for {}", md->os.oi, oid);
        if (!md->ss) {
          logger().error(
-           "{}: oid {} missing snapset",
-           __func__,
-           oid);
+           "get_or_load_head_obc: oid {} missing snapset", oid);
          return crimson::ct_error::object_corrupted::make();
        }
        obc->set_head_state(std::move(md->os), std::move(*(md->ss)));
          logger().debug(
-           "{}: returning obc {} for {}",
-           __func__,
-           obc->obs.oi,
-           obc->obs.oi.soid);
+           "get_or_load_head_obc: returning obc {} for {}",
+           obc->obs.oi, obc->obs.oi.soid);
          return load_obc_ertr::make_ready_future<
            std::pair<crimson::osd::ObjectContextRef, bool>>(
              std::make_pair(obc, false)