Skip to content

Commit 655cddb

Browse files
committed
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: 6208f57 Signed-off-by: Patrick Donnelly <[email protected]>
1 parent 6d8a734 commit 655cddb

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/client/MetaSession.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void MetaSession::enqueue_cap_release(inodeno_t ino, uint64_t cap_id, ceph_seq_t
5656
ceph_mds_cap_item i;
5757
i.ino = ino;
5858
i.cap_id = cap_id;
59-
i.seq = iseq;
59+
i.issue_seq = iseq;
6060
i.migrate_seq = mseq;
6161
release->caps.push_back(i);
6262
}

src/include/ceph_fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ struct ceph_mds_cap_release {
10581058
struct ceph_mds_cap_item {
10591059
__le64 ino;
10601060
__le64 cap_id;
1061-
__le32 migrate_seq, seq;
1061+
__le32 migrate_seq, issue_seq;
10621062
} __attribute__ ((packed));
10631063

10641064
#define CEPH_MDS_LEASE_REVOKE 1 /* mds -> client */

src/mds/Locker.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4222,7 +4222,7 @@ void Locker::handle_client_cap_release(const cref_t<MClientCapRelease> &m)
42224222
Session *session = mds->get_session(m);
42234223

42244224
for (const auto &cap : m->caps) {
4225-
_do_cap_release(client, inodeno_t((uint64_t)cap.ino) , cap.cap_id, cap.migrate_seq, cap.seq);
4225+
_do_cap_release(client, inodeno_t((uint64_t)cap.ino) , cap.cap_id, cap.migrate_seq, cap.issue_seq);
42264226
}
42274227

42284228
if (session) {

0 commit comments

Comments
 (0)