Skip to content

Commit c085f6c

Browse files
lxbszidryomov
authored andcommitted
ceph: rename ceph_flush_cap_releases() to ceph_flush_session_cap_releases()
Prepare for adding a helper to flush the cap releases for all sessions. Signed-off-by: Xiubo Li <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]> Signed-off-by: Ilya Dryomov <[email protected]>
1 parent ede0b1d commit c085f6c

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

fs/ceph/caps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4603,7 +4603,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,
46034603
__ceph_queue_cap_release(session, cap);
46044604
spin_unlock(&session->s_cap_lock);
46054605
}
4606-
ceph_flush_cap_releases(mdsc, session);
4606+
ceph_flush_session_cap_releases(mdsc, session);
46074607
goto done;
46084608

46094609
bad:

fs/ceph/mds_client.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2266,7 +2266,7 @@ int ceph_trim_caps(struct ceph_mds_client *mdsc,
22662266
trim_caps - remaining);
22672267
}
22682268

2269-
ceph_flush_cap_releases(mdsc, session);
2269+
ceph_flush_session_cap_releases(mdsc, session);
22702270
return 0;
22712271
}
22722272

@@ -2420,7 +2420,7 @@ static void ceph_cap_release_work(struct work_struct *work)
24202420
ceph_put_mds_session(session);
24212421
}
24222422

2423-
void ceph_flush_cap_releases(struct ceph_mds_client *mdsc,
2423+
void ceph_flush_session_cap_releases(struct ceph_mds_client *mdsc,
24242424
struct ceph_mds_session *session)
24252425
{
24262426
struct ceph_client *cl = mdsc->fsc->client;
@@ -2447,7 +2447,7 @@ void __ceph_queue_cap_release(struct ceph_mds_session *session,
24472447
session->s_num_cap_releases++;
24482448

24492449
if (!(session->s_num_cap_releases % CEPH_CAPS_PER_RELEASE))
2450-
ceph_flush_cap_releases(session->s_mdsc, session);
2450+
ceph_flush_session_cap_releases(session->s_mdsc, session);
24512451
}
24522452

24532453
static void ceph_cap_reclaim_work(struct work_struct *work)
@@ -4340,7 +4340,7 @@ static void handle_session(struct ceph_mds_session *session,
43404340
/* flush cap releases */
43414341
spin_lock(&session->s_cap_lock);
43424342
if (session->s_num_cap_releases)
4343-
ceph_flush_cap_releases(mdsc, session);
4343+
ceph_flush_session_cap_releases(mdsc, session);
43444344
spin_unlock(&session->s_cap_lock);
43454345

43464346
send_flushmsg_ack(mdsc, session, seq);
@@ -5446,7 +5446,7 @@ static void delayed_work(struct work_struct *work)
54465446
}
54475447
mutex_unlock(&mdsc->mutex);
54485448

5449-
ceph_flush_cap_releases(mdsc, s);
5449+
ceph_flush_session_cap_releases(mdsc, s);
54505450

54515451
mutex_lock(&s->s_mutex);
54525452
if (renew_caps)

fs/ceph/mds_client.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,8 @@ extern void ceph_mdsc_iterate_sessions(struct ceph_mds_client *mdsc,
599599
extern struct ceph_msg *ceph_create_session_msg(u32 op, u64 seq);
600600
extern void __ceph_queue_cap_release(struct ceph_mds_session *session,
601601
struct ceph_cap *cap);
602-
extern void ceph_flush_cap_releases(struct ceph_mds_client *mdsc,
603-
struct ceph_mds_session *session);
602+
extern void ceph_flush_session_cap_releases(struct ceph_mds_client *mdsc,
603+
struct ceph_mds_session *session);
604604
extern void ceph_queue_cap_reclaim_work(struct ceph_mds_client *mdsc);
605605
extern void ceph_reclaim_caps_nr(struct ceph_mds_client *mdsc, int nr);
606606
extern void ceph_queue_cap_unlink_work(struct ceph_mds_client *mdsc);

0 commit comments

Comments
 (0)