diff options
author | Sage Weil <sage@newdream.net> | 2010-06-10 15:55:52 -0400 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-08-01 23:11:39 -0400 |
commit | ee6b272b9c3447a78fa831e37b925aefd5587ec9 (patch) | |
tree | fcb7c31794908d89760fef635ee2a52b1c338fa1 /fs/ceph/mds_client.c | |
parent | 2962507ca204f886967e1a089d9bec206d427c22 (diff) |
ceph: drop unused argument
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/mds_client.c')
-rw-r--r-- | fs/ceph/mds_client.c | 10 |
1 files changed, 4 insertions, 6 deletions
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 | */ |
1069 | int ceph_add_cap_releases(struct ceph_mds_client *mdsc, | 1069 | int 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); |