Skip to content

Commit

Permalink
ceph: drop unused argument
Browse files Browse the repository at this point in the history
Signed-off-by: Sage Weil <sage@newdream.net>
  • Loading branch information
Sage Weil committed Aug 2, 2010
1 parent 2962507 commit ee6b272
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion fs/ceph/caps.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
10 changes: 4 additions & 6 deletions fs/ceph/mds_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions fs/ceph/mds_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit ee6b272

Please sign in to comment.