]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: drop obsolete Pred
authorSage Weil <sage@redhat.com>
Mon, 2 Apr 2018 14:24:16 +0000 (09:24 -0500)
committerSage Weil <sage@redhat.com>
Wed, 4 Apr 2018 13:27:00 +0000 (08:27 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.h

index c429e812a5051ff057007e5ddb4d7c04b348fbc1..0caaa7514bc268ac40bc9c7ab32cddb05b7ac544 100644 (file)
@@ -1738,34 +1738,6 @@ protected:
       }
     }
 
-    /// Must be called on ops queued back to front
-    struct Pred {
-      spg_t pgid;
-      list<OpRequestRef> *out_ops;
-      uint64_t reserved_pushes_to_free;
-      Pred(spg_t pg, list<OpRequestRef> *out_ops = 0)
-       : pgid(pg), out_ops(out_ops), reserved_pushes_to_free(0) {}
-      void accumulate(const OpQueueItem &op) {
-       reserved_pushes_to_free += op.get_reserved_pushes();
-       if (out_ops) {
-         boost::optional<OpRequestRef> mop = op.maybe_get_op();
-         if (mop)
-           out_ops->push_front(*mop);
-       }
-      }
-      bool operator()(const OpQueueItem &op) {
-       if (op.get_ordering_token() == pgid) {
-         accumulate(op);
-         return true;
-       } else {
-         return false;
-       }
-      }
-      uint64_t get_reserved_pushes_to_free() const {
-       return reserved_pushes_to_free;
-      }
-    };
-
     bool is_shard_empty(uint32_t thread_index) override {
       uint32_t shard_index = thread_index % osd->num_shards;
       auto &&sdata = osd->shards[shard_index];