osd: drop unused same_for_*() helpers

These were all identical and mostly served to obscure the actual logic,
which is now captured by can_discard_op() and the matching Objecter
code on the client side.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/osd/PG.h b/src/osd/PG.h
index f6873add98b341849194d9d52b1e7dc45a467fd9..a6536e8f8d57cb9feb1e3bd4d407dcc6a05b667a 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -2107,10 +2107,6 @@ public:
   virtual int do_command(cmdmap_t cmdmap, ostream& ss,
                         bufferlist& idata, bufferlist& odata) = 0;
 
-  virtual bool same_for_read_since(epoch_t e) = 0;
-  virtual bool same_for_modify_since(epoch_t e) = 0;
-  virtual bool same_for_rep_modify_since(epoch_t e) = 0;
-
   virtual void on_role_change() = 0;
   virtual void on_pool_change() = 0;
   virtual void on_change(ObjectStore::Transaction *t) = 0;

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 1b798c1116a138efe9fd18eb8e471963440f1926..ae755fcb531cab3afa87c6a42a4e07e0261fadc8 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -368,24 +368,6 @@ PerfCounters *ReplicatedPG::get_logger()
   return osd->logger;
 }
 
-// =======================
-// pg changes
-
-bool ReplicatedPG::same_for_read_since(epoch_t e)
-{
-  return (e >= info.history.same_primary_since);
-}
-
-bool ReplicatedPG::same_for_modify_since(epoch_t e)
-{
-  return (e >= info.history.same_primary_since);
-}
-
-bool ReplicatedPG::same_for_rep_modify_since(epoch_t e)
-{
-  // check osd map: same set, or primary+acker?
-  return e >= info.history.same_primary_since;
-}
 
 // ====================
 // missing objects

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 4d6000da8c4a1978820f196074d18f33e6deedca..d1bf3597684d79528f0962b426a32a7875359088 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -1322,10 +1322,6 @@ private:
   int _delete_oid(OpContext *ctx, bool no_whiteout);
   int _rollback_to(OpContext *ctx, ceph_osd_op& op);
 public:
-  bool same_for_read_since(epoch_t e);
-  bool same_for_modify_since(epoch_t e);
-  bool same_for_rep_modify_since(epoch_t e);
-
   bool is_missing_object(const hobject_t& oid) const;
   bool is_unreadable_object(const hobject_t &oid) const {
     return is_missing_object(oid) ||