diff options
| author | Sage Weil <sage@newdream.net> | 2010-06-10 12:55:52 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-08-01 20:11:39 -0700 |
| commit | ee6b272b9c3447a78fa831e37b925aefd5587ec9 (patch) | |
| tree | fcb7c31794908d89760fef635ee2a52b1c338fa1 | |
| parent | 2962507ca204f886967e1a089d9bec206d427c22 (diff) | |
ceph: drop unused argument
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | fs/ceph/caps.c | 2 | ||||
| -rw-r--r-- | fs/ceph/mds_client.c | 10 | ||||
| -rw-r--r-- | fs/ceph/mds_client.h | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index b28915d5f404..a5b5725931bf 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -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; } diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index dd440bd438a9..26a5368e91f2 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -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 @@ out_err: } 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); diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index 952410c60d09..e389902db131 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h @@ -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); |