diff options
author | Patrick Donnelly <pdonnell@ibm.com> | 2024-11-13 04:12:27 +0100 |
---|---|---|
committer | Patrick Donnelly <pdonnell@ibm.com> | 2024-11-13 04:12:27 +0100 |
commit | 3829eb6f08678307d153c10051ee774dda780566 (patch) | |
tree | 05fac2c151286501ec46016fd7a53dea03c11b7c /src/include | |
parent | Merge PR #60226 into main (diff) | |
parent | mds: add issue_seq to all cap messages (diff) | |
download | ceph-3829eb6f08678307d153c10051ee774dda780566.tar.xz ceph-3829eb6f08678307d153c10051ee774dda780566.zip |
Merge PR #60283 into main
* refs/pull/60283/head:
mds: add issue_seq to all cap messages
include/ceph_fs: correct ceph_mds_cap_peer field name
include/ceph_fs: correct ceph_mds_cap_item field name
messages/MClientCaps: use correct ceph_seq_t for cap sequence types
messages/MClientCaps: dump issue_seq for debugging
mds: remove dead code
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/ceph_fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h index 627f4a3e85b..137669c1963 100644 --- a/src/include/ceph_fs.h +++ b/src/include/ceph_fs.h @@ -1005,7 +1005,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; @@ -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 */ |