Skip to content

Commit 1da6ef2

Browse files
committed
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: 4fdeb00 Signed-off-by: Patrick Donnelly <[email protected]>
1 parent 655cddb commit 1da6ef2

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/client/Client.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5518,10 +5518,10 @@ void Client::handle_cap_export(MetaSession *session, Inode *in, const MConstRef<
55185518
if (it != in->caps.end()) {
55195519
Cap &tcap = it->second;
55205520
if (tcap.cap_id == m->peer.cap_id &&
5521-
ceph_seq_cmp(tcap.seq, m->peer.seq) < 0) {
5521+
ceph_seq_cmp(tcap.seq, m->peer.issue_seq) < 0) {
55225522
tcap.cap_id = m->peer.cap_id;
5523-
tcap.seq = m->peer.seq - 1;
5524-
tcap.issue_seq = tcap.seq;
5523+
tcap.seq = m->peer.issue_seq - 1;
5524+
tcap.issue_seq = tcap.issue_seq;
55255525
tcap.issued |= cap.issued;
55265526
tcap.implemented |= cap.issued;
55275527
if (&cap == in->auth_cap)
@@ -5531,7 +5531,7 @@ void Client::handle_cap_export(MetaSession *session, Inode *in, const MConstRef<
55315531
}
55325532
} else {
55335533
add_update_cap(in, tsession.get(), m->peer.cap_id, cap.issued, 0,
5534-
m->peer.seq - 1, m->peer.mseq, (uint64_t)-1,
5534+
m->peer.issue_seq - 1, m->peer.mseq, (uint64_t)-1,
55355535
&cap == in->auth_cap ? CEPH_CAP_FLAG_AUTH : 0,
55365536
cap.latest_perms);
55375537
}

src/include/ceph_fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ extern const char *ceph_cap_op_name(int op);
10051005
/* extra info for cap import/export */
10061006
struct ceph_mds_cap_peer {
10071007
__le64 cap_id;
1008-
__le32 seq;
1008+
__le32 issue_seq;
10091009
__le32 mseq;
10101010
__le32 mds;
10111011
__u8 flags;

src/messages/MClientCaps.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ class MClientCaps final : public SafeMessage {
117117
void set_ctime(const utime_t &t) { ctime = t; }
118118
void set_atime(const utime_t &t) { atime = t; }
119119

120-
void set_cap_peer(uint64_t id, ceph_seq_t seq, ceph_seq_t mseq, int mds, int flags) {
120+
void set_cap_peer(uint64_t id, ceph_seq_t issue_seq, ceph_seq_t mseq, int mds, int flags) {
121121
peer.cap_id = id;
122-
peer.seq = seq;
122+
peer.issue_seq = issue_seq;
123123
peer.mseq = mseq;
124124
peer.mds = mds;
125125
peer.flags = flags;

0 commit comments

Comments
 (0)