From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Wed, 11 Dec 2024 01:40:09 +0000 (+0800)
Subject: crimson/os/seastore: drop unnecessary _xattr_clear()
X-Git-Tag: testing/wip-pdonnell-testing-20250324.181635-debug~63^2~14
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=43f9eeb1e36833debf635abe7dbdf87ad120c60f;p=ceph-ci.git

crimson/os/seastore: drop unnecessary _xattr_clear()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc
index 1616e02cdad..42c44f60871 100644
--- a/src/crimson/os/seastore/seastore.cc
+++ b/src/crimson/os/seastore/seastore.cc
@@ -2575,18 +2575,10 @@ SeaStore::Shard::_rmattrs(
   internal_context_t &ctx,
   OnodeRef &onode)
 {
+  LOG_PREFIX(SeaStoreS::_rmattrs);
+  DEBUGT("onode={}", *ctx.transaction, *onode);
   onode->clear_object_info(*ctx.transaction);
   onode->clear_snapset(*ctx.transaction);
-  return _xattr_clear(ctx, onode);
-}
-
-SeaStore::Shard::tm_ret
-SeaStore::Shard::_xattr_clear(
-  internal_context_t &ctx,
-  OnodeRef &onode)
-{
-  LOG_PREFIX(SeaStoreS::_xattr_clear);
-  DEBUGT("onode={}", *ctx.transaction, *onode);
   auto root = onode->get_layout().xattr_root.get(
     onode->get_metadata_hint(device->get_block_size()));
   if (root.is_null()) {
diff --git a/src/crimson/os/seastore/seastore.h b/src/crimson/os/seastore/seastore.h
index f5e010de8de..75a7bf7ff75 100644
--- a/src/crimson/os/seastore/seastore.h
+++ b/src/crimson/os/seastore/seastore.h
@@ -487,9 +487,6 @@ public:
       internal_context_t &ctx,
       OnodeRef &onode,
       std::string &&name);
-    tm_ret _xattr_clear(
-      internal_context_t &ctx,
-      OnodeRef &onode);
     tm_ret _create_collection(
       internal_context_t &ctx,
       const coll_t& cid, int bits);