include/ceph_fs: correct ceph_mds_cap_item field name

Originally, the last_sent sequence from the MDS was sent by the client during
bulk cap release but it was shortly after changed to the last_issue which is
the sequence number that the cap was originally "issued" by the MDS rank (which
may be updated after import of caps).

Fixes: 6208f57f487ac170df24a9018f1cc87a5ac8b4b3
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/client/MetaSession.cc b/src/client/MetaSession.cc
index b5160a84331b61e20c7c72ab1e425dc46bb74458..3baa833851fd98b76be55c48fce9e569f34fa997 100644 (file)
--- a/src/client/MetaSession.cc
+++ b/src/client/MetaSession.cc
@@ -56,7 +56,7 @@ void MetaSession::enqueue_cap_release(inodeno_t ino, uint64_t cap_id, ceph_seq_t
   ceph_mds_cap_item i;
   i.ino = ino;
   i.cap_id = cap_id;
-  i.seq = iseq;
+  i.issue_seq = iseq;
   i.migrate_seq = mseq;
   release->caps.push_back(i);
 }

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 627f4a3e85bda3fcea5b00e393c25a5f94e72707..08ca13076130742319c79564bac09d50cedb14bc 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -1058,7 +1058,7 @@ struct ceph_mds_cap_release {
 struct ceph_mds_cap_item {
        __le64 ino;
        __le64 cap_id;
-       __le32 migrate_seq, seq;
+       __le32 migrate_seq, issue_seq;
 } __attribute__ ((packed));
 
 #define CEPH_MDS_LEASE_REVOKE           1  /*    mds  -> client */

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 63608d488647094dc108af04a634f87a3316f51f..f65704a017635b188236976a87bdb137135d0ecd 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -4222,7 +4222,7 @@ void Locker::handle_client_cap_release(const cref_t<MClientCapRelease> &m)
   Session *session = mds->get_session(m);
 
   for (const auto &cap : m->caps) {
-    _do_cap_release(client, inodeno_t((uint64_t)cap.ino) , cap.cap_id, cap.migrate_seq, cap.seq);
+    _do_cap_release(client, inodeno_t((uint64_t)cap.ino) , cap.cap_id, cap.migrate_seq, cap.issue_seq);
   }
 
   if (session) {