aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-06-10 15:55:52 -0400
committerSage Weil <sage@newdream.net>2010-08-01 23:11:39 -0400
commitee6b272b9c3447a78fa831e37b925aefd5587ec9 (patch)
treefcb7c31794908d89760fef635ee2a52b1c338fa1 /fs/ceph
parent2962507ca204f886967e1a089d9bec206d427c22 (diff)
ceph: drop unused argument
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/caps.c2
-rw-r--r--fs/ceph/mds_client.c10
-rw-r--r--fs/ceph/mds_client.h3
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,
2717 * along for the mds (who clearly thinks we still have this 2717 * along for the mds (who clearly thinks we still have this
2718 * cap). 2718 * cap).
2719 */ 2719 */
2720 ceph_add_cap_releases(mdsc, session, -1); 2720 ceph_add_cap_releases(mdsc, session);
2721 ceph_send_cap_releases(mdsc, session); 2721 ceph_send_cap_releases(mdsc, session);
2722 goto done; 2722 goto done;
2723 } 2723 }
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,
1067 * Called under s_mutex. 1067 * Called under s_mutex.
1068 */ 1068 */
1069int ceph_add_cap_releases(struct ceph_mds_client *mdsc, 1069int ceph_add_cap_releases(struct ceph_mds_client *mdsc,
1070 struct ceph_mds_session *session, 1070 struct ceph_mds_session *session)
1071 int extra)
1072{ 1071{
1073 struct ceph_msg *msg; 1072 struct ceph_msg *msg;
1074 struct ceph_mds_cap_release *head; 1073 struct ceph_mds_cap_release *head;
1075 int err = -ENOMEM; 1074 int err = -ENOMEM;
1075 int extra = mdsc->client->mount_args->cap_release_safety;
1076 1076
1077 if (extra < 0)
1078 extra = mdsc->client->mount_args->cap_release_safety;
1079 1077
1080 spin_lock(&session->s_cap_lock); 1078 spin_lock(&session->s_cap_lock);
1081 1079
@@ -2005,7 +2003,7 @@ out_err:
2005 } 2003 }
2006 mutex_unlock(&mdsc->mutex); 2004 mutex_unlock(&mdsc->mutex);
2007 2005
2008 ceph_add_cap_releases(mdsc, req->r_session, -1); 2006 ceph_add_cap_releases(mdsc, req->r_session);
2009 mutex_unlock(&session->s_mutex); 2007 mutex_unlock(&session->s_mutex);
2010 2008
2011 /* kick calling process */ 2009 /* kick calling process */
@@ -2715,7 +2713,7 @@ static void delayed_work(struct work_struct *work)
2715 send_renew_caps(mdsc, s); 2713 send_renew_caps(mdsc, s);
2716 else 2714 else
2717 ceph_con_keepalive(&s->s_con); 2715 ceph_con_keepalive(&s->s_con);
2718 ceph_add_cap_releases(mdsc, s, -1); 2716 ceph_add_cap_releases(mdsc, s);
2719 if (s->s_state == CEPH_MDS_SESSION_OPEN || 2717 if (s->s_state == CEPH_MDS_SESSION_OPEN ||
2720 s->s_state == CEPH_MDS_SESSION_HUNG) 2718 s->s_state == CEPH_MDS_SESSION_HUNG)
2721 ceph_send_cap_releases(mdsc, s); 2719 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)
324} 324}
325 325
326extern int ceph_add_cap_releases(struct ceph_mds_client *mdsc, 326extern int ceph_add_cap_releases(struct ceph_mds_client *mdsc,
327 struct ceph_mds_session *session, 327 struct ceph_mds_session *session);
328 int extra);
329extern void ceph_send_cap_releases(struct ceph_mds_client *mdsc, 328extern void ceph_send_cap_releases(struct ceph_mds_client *mdsc,
330 struct ceph_mds_session *session); 329 struct ceph_mds_session *session);
331 330