include/ceph_fs: correct ceph_mds_cap_peer field name

The peer seq is used as the issue_seq. Use that name for consistency.

Fixes: 4fdeb00df20ccd36c1e53c6ea234c63c18a9ff5a
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 1da6ef237fc70ddd64152d029cd6e0cf8f0c808e)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 4e417d54767c8939f5a29b1ba0a0ba44a9a0699b..dc2cda72c1ebd96a9a91e59961298411c52329e8 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -5509,10 +5509,10 @@ void Client::handle_cap_export(MetaSession *session, Inode *in, const MConstRef<
         if (it != in->caps.end()) {
          Cap &tcap = it->second;
          if (tcap.cap_id == m->peer.cap_id &&
-             ceph_seq_cmp(tcap.seq, m->peer.seq) < 0) {
+             ceph_seq_cmp(tcap.seq, m->peer.issue_seq) < 0) {
            tcap.cap_id = m->peer.cap_id;
-           tcap.seq = m->peer.seq - 1;
-           tcap.issue_seq = tcap.seq;
+           tcap.seq = m->peer.issue_seq - 1;
+           tcap.issue_seq = tcap.issue_seq;
            tcap.issued |= cap.issued;
            tcap.implemented |= cap.issued;
            if (&cap == in->auth_cap)
@@ -5522,7 +5522,7 @@ void Client::handle_cap_export(MetaSession *session, Inode *in, const MConstRef<
          }
         } else {
          add_update_cap(in, tsession.get(), m->peer.cap_id, cap.issued, 0,
-                        m->peer.seq - 1, m->peer.mseq, (uint64_t)-1,
+                        m->peer.issue_seq - 1, m->peer.mseq, (uint64_t)-1,
                         &cap == in->auth_cap ? CEPH_CAP_FLAG_AUTH : 0,
                         cap.latest_perms);
         }

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 0ab4e46ed6815b29469e25158d21e86410bc35e5..54e0d46e1220fe3662a50c4ae342303c70da1877 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -1004,7 +1004,7 @@ extern const char *ceph_cap_op_name(int op);
 /* extra info for cap import/export */
 struct ceph_mds_cap_peer {
        __le64 cap_id;
-       __le32 seq;
+       __le32 issue_seq;
        __le32 mseq;
        __le32 mds;
        __u8   flags;

diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
index a733168d475d667257677ad1883fa2e46ef1e082..fc2b85bd63afd5ea1023060e8beefe6836b63235 100644 (file)
--- a/src/messages/MClientCaps.h
+++ b/src/messages/MClientCaps.h
@@ -117,9 +117,9 @@ private:
   void set_ctime(const utime_t &t) { ctime = t; }
   void set_atime(const utime_t &t) { atime = t; }
 
-  void set_cap_peer(uint64_t id, ceph_seq_t seq, ceph_seq_t mseq, int mds, int flags) {
+  void set_cap_peer(uint64_t id, ceph_seq_t issue_seq, ceph_seq_t mseq, int mds, int flags) {
     peer.cap_id = id;
-    peer.seq = seq;
+    peer.issue_seq = issue_seq;
     peer.mseq = mseq;
     peer.mds = mds;
     peer.flags = flags;