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 <xiubli@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 6561a6cd94de25d296c86e4406f3d0557f1f77ea..888bf9a290a83f1d323e9132839e33e6eefa0e2c 100644 (file)
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -4603,7 +4603,7 @@ flush_cap_releases:
                __ceph_queue_cap_release(session, cap);
                spin_unlock(&session->s_cap_lock);
        }
-       ceph_flush_cap_releases(mdsc, session);
+       ceph_flush_session_cap_releases(mdsc, session);
        goto done;
 
 bad:

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 276e34ab3e2ccaa40903196c9d1507fc49ed0bcb..36c5886b5aac06d9d8c16473f77eb220c759a327 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2266,7 +2266,7 @@ int ceph_trim_caps(struct ceph_mds_client *mdsc,
                      trim_caps - remaining);
        }
 
-       ceph_flush_cap_releases(mdsc, session);
+       ceph_flush_session_cap_releases(mdsc, session);
        return 0;
 }
 
@@ -2420,7 +2420,7 @@ static void ceph_cap_release_work(struct work_struct *work)
        ceph_put_mds_session(session);
 }
 
-void ceph_flush_cap_releases(struct ceph_mds_client *mdsc,
+void ceph_flush_session_cap_releases(struct ceph_mds_client *mdsc,
                             struct ceph_mds_session *session)
 {
        struct ceph_client *cl = mdsc->fsc->client;
@@ -2447,7 +2447,7 @@ void __ceph_queue_cap_release(struct ceph_mds_session *session,
        session->s_num_cap_releases++;
 
        if (!(session->s_num_cap_releases % CEPH_CAPS_PER_RELEASE))
-               ceph_flush_cap_releases(session->s_mdsc, session);
+               ceph_flush_session_cap_releases(session->s_mdsc, session);
 }
 
 static void ceph_cap_reclaim_work(struct work_struct *work)
@@ -4340,7 +4340,7 @@ skip_cap_auths:
                /* flush cap releases */
                spin_lock(&session->s_cap_lock);
                if (session->s_num_cap_releases)
-                       ceph_flush_cap_releases(mdsc, session);
+                       ceph_flush_session_cap_releases(mdsc, session);
                spin_unlock(&session->s_cap_lock);
 
                send_flushmsg_ack(mdsc, session, seq);
@@ -5446,7 +5446,7 @@ static void delayed_work(struct work_struct *work)
                }
                mutex_unlock(&mdsc->mutex);
 
-               ceph_flush_cap_releases(mdsc, s);
+               ceph_flush_session_cap_releases(mdsc, s);
 
                mutex_lock(&s->s_mutex);
                if (renew_caps)

diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 585ab5a6d87d5fb20bb4292ab136708061ad0831..3dd54587944ac05f39e2e8d79592202707c26463 100644 (file)
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -599,8 +599,8 @@ extern void ceph_mdsc_iterate_sessions(struct ceph_mds_client *mdsc,
 extern struct ceph_msg *ceph_create_session_msg(u32 op, u64 seq);
 extern void __ceph_queue_cap_release(struct ceph_mds_session *session,
                                    struct ceph_cap *cap);
-extern void ceph_flush_cap_releases(struct ceph_mds_client *mdsc,
-                                   struct ceph_mds_session *session);
+extern void ceph_flush_session_cap_releases(struct ceph_mds_client *mdsc,
+                                           struct ceph_mds_session *session);
 extern void ceph_queue_cap_reclaim_work(struct ceph_mds_client *mdsc);
 extern void ceph_reclaim_caps_nr(struct ceph_mds_client *mdsc, int nr);
 extern void ceph_queue_cap_unlink_work(struct ceph_mds_client *mdsc);