From: Kefu Chai <kchai@redhat.com>
Date: Fri, 14 Aug 2020 13:26:21 +0000 (+0800)
Subject: crimson/osd: do not use __func__ in a lambda
X-Git-Tag: wip-pdonnell-testing-20200918.022351~360^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96e12dc4e4fbda0d1550ae1bcfcf9c2ed91d4394;p=ceph-ci.git

crimson/osd: do not use __func__ in a lambda

otherwise we would have logging messages like

operator(): returning obc ...

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index f05d36acd68..99b79394b59 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -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)