From: Kefu Chai <kchai@redhat.com>
Date: Fri, 7 May 2021 13:14:30 +0000 (+0800)
Subject: crimson/os/seastore: do not start identifier with "__"
X-Git-Tag: v17.1.0~2037^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=72a5a1aaf67f4b81026bfc42cc8e3447612943d6;p=ceph.git

crimson/os/seastore: do not start identifier with "__"

avoid starting identifiers with two underscores, these names are
reserved for C/C++ compiler and standard library.

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

diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc
index ee0b791658719..2adf9efefaa52 100644
--- a/src/crimson/os/seastore/seastore.cc
+++ b/src/crimson/os/seastore/seastore.cc
@@ -764,7 +764,7 @@ SeaStore::tm_ret SeaStore::_write(
 }
 
 SeaStore::omap_set_kvs_ret
-SeaStore::__omap_set_kvs(
+SeaStore::_omap_set_kvs(
   const omap_root_le_t& omap_root,
   Transaction& t,
   omap_root_le_t& mutable_omap_root,
@@ -802,7 +802,7 @@ SeaStore::tm_ret SeaStore::_omap_set_values(
 {
   LOG_PREFIX(SeaStore::_omap_set_values);
   DEBUGT("{} {} keys", *ctx.transaction, *onode, aset.size());
-  return __omap_set_kvs(
+  return _omap_set_kvs(
     onode->get_layout().omap_root,
     *ctx.transaction,
     onode->get_mutable_layout(*ctx.transaction).omap_root,
@@ -928,7 +928,7 @@ SeaStore::tm_ret SeaStore::_setattrs(
     return tm_ertr::now();
   }
 
-  return __omap_set_kvs(
+  return _omap_set_kvs(
     onode->get_layout().xattr_root,
     *ctx.transaction,
     layout.xattr_root,
diff --git a/src/crimson/os/seastore/seastore.h b/src/crimson/os/seastore/seastore.h
index 8b28b715c829f..c7698efbf3d5b 100644
--- a/src/crimson/os/seastore/seastore.h
+++ b/src/crimson/os/seastore/seastore.h
@@ -298,7 +298,7 @@ private:
     internal_context_t &ctx,
     const coll_t& cid);
   using omap_set_kvs_ret = tm_ertr::future<>;
-  omap_set_kvs_ret __omap_set_kvs(
+  omap_set_kvs_ret _omap_set_kvs(
     const omap_root_le_t& omap_root,
     Transaction& t,
     omap_root_le_t& mutable_omap_root,