update sources to 12.2.7

[ceph.git] / ceph / src / mds / Capability.h

diff --git a/ceph/src/mds/Capability.h b/ceph/src/mds/Capability.h
index ffe88c242aee45d5280be04b0e35cb47d48604f7..e8e05dbd609eb359792ebfde24b2385cf0a1484c 100644 (file)
--- a/ceph/src/mds/Capability.h
+++ b/ceph/src/mds/Capability.h
@@ -271,7 +271,7 @@ public:
   Export make_export() {
     return Export(cap_id, _wanted, issued(), pending(), client_follows, last_sent, mseq+1, last_issue_stamp);
   }
-  void merge(Export& other, bool auth_cap) {
+  void merge(const Export& other, bool auth_cap) {
     if (!is_stale()) {
       // issued + pending
       int newpending = other.pending | pending();