From: Samuel Just <sam.just@inktank.com>
Date: Fri, 27 Jun 2014 17:54:23 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into wip-7999-master
X-Git-Tag: v0.84~172^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2027%2Fhead;p=ceph.git

Merge remote-tracking branch 'upstream/master' into wip-7999-master

Conflicts:
	src/os/KeyValueStore.h
---

f48a0333eb748bc900b1235bca60f02822ab5ef1
diff --cc src/os/KeyValueStore.h
index 402b4cba92b,59e01a9c4a1..5f62c5a0bfa
--- a/src/os/KeyValueStore.h
+++ b/src/os/KeyValueStore.h
@@@ -257,9 -266,8 +266,9 @@@ class KeyValueStore : public ObjectStor
    class OpSequencer : public Sequencer_impl {
      Mutex qlock; // to protect q, for benefit of flush (peek/dequeue also protected by lock)
      list<Op*> q;
-     list<uint64_t> jq;
      Cond cond;
 +    list<pair<uint64_t, Context*> > flush_commit_waiters;
+     uint64_t op; // used by flush() to know the sequence of op
     public:
      Sequencer *parent;
      Mutex apply_lock;  // for apply mutual exclusion