summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max.kellermann@ionos.com>2026-07-09 12:48:56 +0200
committerIlya Dryomov <idryomov@gmail.com>2026-08-26 19:57:26 +0200
commitac9d69ae4835807fc1ecdab9c85fe7eca682de08 (patch)
treea59a26db9a34b49ad0a2cb55d0f1d9b0472c0588
parente33752c8510076f3ef63198ee2bce15ed1ae14d9 (diff)
downloadlinux-ac9d69ae4835807fc1ecdab9c85fe7eca682de08.tar.gz
linux-ac9d69ae4835807fc1ecdab9c85fe7eca682de08.zip
ceph: use detach_cap_releases() in ceph_send_cap_releases()
Eliminate some redundant code. Signed-off-by: Max Kellermann <max.kellermann@ionos.com> Reviewed-by: Xiubo Li <xiubo.li@clyso.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-rw-r--r--fs/ceph/mds_client.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 32d5b59ccc4f..c7b47c98b777 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1804,16 +1804,19 @@ static void __open_export_target_sessions(struct ceph_mds_client *mdsc,
* session caps
*/
-static void detach_cap_releases(struct ceph_mds_session *session,
- struct list_head *target)
+static int detach_cap_releases(struct ceph_mds_session *session,
+ struct list_head *target)
{
struct ceph_client *cl = session->s_mdsc->fsc->client;
+ const int num_cap_releases = session->s_num_cap_releases;
lockdep_assert_held(&session->s_cap_lock);
list_splice_init(&session->s_cap_releases, target);
session->s_num_cap_releases = 0;
doutc(cl, "mds%d\n", session->s_mds);
+
+ return num_cap_releases;
}
static void dispose_cap_releases(struct ceph_mds_client *mdsc,
@@ -2469,9 +2472,7 @@ static void ceph_send_cap_releases(struct ceph_mds_client *mdsc,
spin_lock(&session->s_cap_lock);
again:
- list_splice_init(&session->s_cap_releases, &tmp_list);
- num_cap_releases = session->s_num_cap_releases;
- session->s_num_cap_releases = 0;
+ num_cap_releases = detach_cap_releases(session, &tmp_list);
spin_unlock(&session->s_cap_lock);
while (!list_empty(&tmp_list)) {