From: Sage Weil <sage@inktank.com>
Date: Tue, 17 Dec 2013 01:03:27 +0000 (-0800)
Subject: Merge pull request #904 from ceph/wip-mds-cluster2
X-Git-Tag: v0.75~93
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=00f436c1443092e618d9fc5752e77e57694d972c;p=ceph.git

Merge pull request #904 from ceph/wip-mds-cluster2

Wip mds cluster2

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

00f436c1443092e618d9fc5752e77e57694d972c
diff --cc src/mds/Capability.h
index 5ba690134f69,d56e9153865d..e6a6f4721479
--- a/src/mds/Capability.h
+++ b/src/mds/Capability.h
@@@ -231,11 -247,9 +247,12 @@@ public
      g_num_cap--;
      g_num_caps++;
    }
 +
 +  Capability(const Capability& other);  // no copying
 +  const Capability& operator=(const Capability& other);  // no copying
    
    ceph_seq_t get_mseq() { return mseq; }
+   void inc_mseq() { mseq++; }
  
    ceph_seq_t get_last_sent() { return last_sent; }
    utime_t get_last_issue_stamp() { return last_issue_stamp; }