Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee6b272b authored by Sage Weil's avatar Sage Weil
Browse files

ceph: drop unused argument 



Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 2962507c

fs/ceph/caps.c

+1 −1
Original line number Diff line number Diff line
@@ -2717,7 +2717,7 @@ void ceph_handle_caps(struct ceph_mds_session *session, 
		 * along for the mds (who clearly thinks we still have this

		 * cap).

		 */

		ceph_add_cap_releases(mdsc, session, -1);

		ceph_add_cap_releases(mdsc, session);

		ceph_send_cap_releases(mdsc, session);

		goto done;

	}

fs/ceph/mds_client.c

+4 −6
Original line number Diff line number Diff line
@@ -1067,15 +1067,13 @@ static int trim_caps(struct ceph_mds_client *mdsc, 
 * Called under s_mutex.

 */

int ceph_add_cap_releases(struct ceph_mds_client *mdsc,

			  struct ceph_mds_session *session,

			  int extra)

			  struct ceph_mds_session *session)

{

	struct ceph_msg *msg;

	struct ceph_mds_cap_release *head;

	int err = -ENOMEM;

	int extra = mdsc->client->mount_args->cap_release_safety;



	if (extra < 0)

		extra = mdsc->client->mount_args->cap_release_safety;



	spin_lock(&session->s_cap_lock);
@@ -2005,7 +2003,7 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) 
	}

	mutex_unlock(&mdsc->mutex);



	ceph_add_cap_releases(mdsc, req->r_session, -1);

	ceph_add_cap_releases(mdsc, req->r_session);

	mutex_unlock(&session->s_mutex);



	/* kick calling process */
@@ -2715,7 +2713,7 @@ static void delayed_work(struct work_struct *work) 
			send_renew_caps(mdsc, s);

		else

			ceph_con_keepalive(&s->s_con);

		ceph_add_cap_releases(mdsc, s, -1);

		ceph_add_cap_releases(mdsc, s);

		if (s->s_state == CEPH_MDS_SESSION_OPEN ||

		    s->s_state == CEPH_MDS_SESSION_HUNG)

			ceph_send_cap_releases(mdsc, s);

fs/ceph/mds_client.h

+1 −2
Original line number Diff line number Diff line
@@ -324,8 +324,7 @@ static inline void ceph_mdsc_put_request(struct ceph_mds_request *req) 
}



extern int ceph_add_cap_releases(struct ceph_mds_client *mdsc,

				 struct ceph_mds_session *session,

				 int extra);

				 struct ceph_mds_session *session);

extern void ceph_send_cap_releases(struct ceph_mds_client *mdsc,

				   struct ceph_mds_session *session);