Commit c085f6ca authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

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: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent ede0b1d3

fs/ceph/caps.c

+1 −1
Original line number Diff line number Diff line
@@ -4603,7 +4603,7 @@ void ceph_handle_caps(struct ceph_mds_session *session, 
		__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:

fs/ceph/mds_client.c

+5 −5
Original line number Diff line number Diff line
@@ -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 @@ static void handle_session(struct ceph_mds_session *session, 
		/* 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)

fs/ceph/mds_client.h

+2 −2
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ 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,

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);