From: Patrick Donnelly <batrick@batbytes.com>
To: Xiubo Li <xiubli@redhat.com>, Ilya Dryomov <idryomov@gmail.com>
Cc: Patrick Donnelly <batrick@batbytes.com>,
Patrick Donnelly <pdonnell@redhat.com>,
ceph-devel@vger.kernel.org (open list:CEPH DISTRIBUTED FILE
SYSTEM CLIENT (CEPH)), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v2 1/3] ceph: correct ceph_mds_cap_item field name
Date: Mon, 18 Nov 2024 21:27:48 -0500 [thread overview]
Message-ID: <20241119022752.1256662-2-batrick@batbytes.com> (raw)
In-Reply-To: <20241119022752.1256662-1-batrick@batbytes.com>
The issue_seq is sent with bulk cap releases, not the current sequence number.
See also ceph.git commit: "include/ceph_fs: correct ceph_mds_cap_item field name".
See-also: https://tracker.ceph.com/issues/66704
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---
fs/ceph/mds_client.c | 2 +-
include/linux/ceph/ceph_fs.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index c4a5fd94bbbb..0be82de8a6da 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2362,7 +2362,7 @@ static void ceph_send_cap_releases(struct ceph_mds_client *mdsc,
item->ino = cpu_to_le64(cap->cap_ino);
item->cap_id = cpu_to_le64(cap->cap_id);
item->migrate_seq = cpu_to_le32(cap->mseq);
- item->seq = cpu_to_le32(cap->issue_seq);
+ item->issue_seq = cpu_to_le32(cap->issue_seq);
msg->front.iov_len += sizeof(*item);
ceph_put_cap(mdsc, cap);
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index ee1d0e5f9789..4ff3ad5e9210 100644
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -822,7 +822,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 */
--
Patrick Donnelly, Ph.D.
He / Him / His
Red Hat Partner Engineer
IBM, Inc.
GPG: 19F28A586F808C2402351B93C3301A3E258DD79D
next prev parent reply other threads:[~2024-11-19 2:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-19 2:27 [PATCH v2 0/3] ceph: rename some seq fields to issue_seq Patrick Donnelly
2024-11-19 2:27 ` Patrick Donnelly [this message]
2024-11-19 2:27 ` [PATCH v2 2/3] ceph: correct ceph_mds_cap_peer field name Patrick Donnelly
2024-11-19 2:27 ` [PATCH v2 3/3] ceph: improve caps debugging output Patrick Donnelly
2024-11-19 10:31 ` [PATCH v2 0/3] ceph: rename some seq fields to issue_seq Ilya Dryomov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241119022752.1256662-2-batrick@batbytes.com \
--to=batrick@batbytes.com \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pdonnell@redhat.com \
--cc=xiubli@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox