aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan, Zheng <zyan@redhat.com>2018-03-13 07:52:20 -0400
committerIlya Dryomov <idryomov@gmail.com>2018-04-02 04:12:49 -0400
commit7aac453a03a2216fcda4f4d72ae4d2089a013bb3 (patch)
treea104f8dfe88adc8b419425336d8ba6715fda36e7
parent50c55aeca27f09ceda0cd58b72b0addeecef74eb (diff)
ceph: rename function drop_leases() to a more descriptive name
Signed-off-by: "Yan, Zheng" <zyan@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-rw-r--r--fs/ceph/mds_client.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index b50044374947..537048b4a4d5 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -3473,13 +3473,12 @@ void ceph_mdsc_lease_send_msg(struct ceph_mds_session *session,
3473} 3473}
3474 3474
3475/* 3475/*
3476 * drop all leases (and dentry refs) in preparation for umount 3476 * lock unlock sessions, to wait ongoing session activities
3477 */ 3477 */
3478static void drop_leases(struct ceph_mds_client *mdsc) 3478static void lock_unlock_sessions(struct ceph_mds_client *mdsc)
3479{ 3479{
3480 int i; 3480 int i;
3481 3481
3482 dout("drop_leases\n");
3483 mutex_lock(&mdsc->mutex); 3482 mutex_lock(&mdsc->mutex);
3484 for (i = 0; i < mdsc->max_sessions; i++) { 3483 for (i = 0; i < mdsc->max_sessions; i++) {
3485 struct ceph_mds_session *s = __ceph_lookup_mds_session(mdsc, i); 3484 struct ceph_mds_session *s = __ceph_lookup_mds_session(mdsc, i);
@@ -3663,7 +3662,7 @@ void ceph_mdsc_pre_umount(struct ceph_mds_client *mdsc)
3663 dout("pre_umount\n"); 3662 dout("pre_umount\n");
3664 mdsc->stopping = 1; 3663 mdsc->stopping = 1;
3665 3664
3666 drop_leases(mdsc); 3665 lock_unlock_sessions(mdsc);
3667 ceph_flush_dirty_caps(mdsc); 3666 ceph_flush_dirty_caps(mdsc);
3668 wait_requests(mdsc); 3667 wait_requests(mdsc);
3669 3668