From: Liao Weizhong <liaoweizhong@unionpay.com>
Date: Fri, 27 Oct 2017 07:35:16 +0000 (+0800)
Subject: osd/PrimaryLogPG: drop unused parameters
X-Git-Tag: v13.0.1~339^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18581%2Fhead;p=ceph.git

osd/PrimaryLogPG: drop unused parameters

Signed-off-by: Liao Weizhong <liaoweizhong@unionpay.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 8b9beedba7b6..dd1c8f54e827 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -7023,8 +7023,8 @@ void PrimaryLogPG::_make_clone(
   ::encode(*poi, bv, get_osdmap()->get_features(CEPH_ENTITY_TYPE_OSD, nullptr));
 
   t->clone(coid, head);
-  setattr_maybe_cache(obc, ctx, t, OI_ATTR, bv);
-  rmattr_maybe_cache(obc, ctx, t, SS_ATTR);
+  setattr_maybe_cache(obc, t, OI_ATTR, bv);
+  rmattr_maybe_cache(obc, t, SS_ATTR);
 }
 
 void PrimaryLogPG::make_writeable(OpContext *ctx)
@@ -12536,7 +12536,7 @@ void PrimaryLogPG::hit_set_persist()
   map <string, bufferlist> attrs;
   attrs[OI_ATTR].claim(boi);
   attrs[SS_ATTR].claim(bss);
-  setattrs_maybe_cache(ctx->obc, ctx.get(), ctx->op_t.get(), attrs);
+  setattrs_maybe_cache(ctx->obc, ctx->op_t.get(), attrs);
   ctx->log.push_back(
     pg_log_entry_t(
       pg_log_entry_t::MODIFY,
@@ -14125,7 +14125,6 @@ boost::statechart::result PrimaryLogPG::AwaitAsyncWork::react(const DoSnapWork&)
 
 void PrimaryLogPG::setattr_maybe_cache(
   ObjectContextRef obc,
-  OpContext *op,
   PGTransaction *t,
   const string &key,
   bufferlist &val)
@@ -14135,7 +14134,6 @@ void PrimaryLogPG::setattr_maybe_cache(
 
 void PrimaryLogPG::setattrs_maybe_cache(
   ObjectContextRef obc,
-  OpContext *op,
   PGTransaction *t,
   map<string, bufferlist> &attrs)
 {
@@ -14144,7 +14142,6 @@ void PrimaryLogPG::setattrs_maybe_cache(
 
 void PrimaryLogPG::rmattr_maybe_cache(
   ObjectContextRef obc,
-  OpContext *op,
   PGTransaction *t,
   const string &key)
 {
diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h
index fb9541787150..35ca19570cd6 100644
--- a/src/osd/PrimaryLogPG.h
+++ b/src/osd/PrimaryLogPG.h
@@ -1796,18 +1796,15 @@ public:
   // attr cache handling
   void setattr_maybe_cache(
     ObjectContextRef obc,
-    OpContext *op,
     PGTransaction *t,
     const string &key,
     bufferlist &val);
   void setattrs_maybe_cache(
     ObjectContextRef obc,
-    OpContext *op,
     PGTransaction *t,
     map<string, bufferlist> &attrs);
   void rmattr_maybe_cache(
     ObjectContextRef obc,
-    OpContext *op,
     PGTransaction *t,
     const string &key);
   int getattr_maybe_cache(