ceph: remove recon_gen logic
We don't get an explicit affirmative confirmation that our caps reconnect,
nor do we necessarily want to pay that cost. So, take all this code out
for now.
Signed-off-by: Sage Weil <sage@newdream.net>
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 828417a..aad10d9 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -329,7 +329,6 @@
ceph_con_open(&s->s_con, ceph_mdsmap_get_addr(mdsc->mdsmap, mds));
spin_lock_init(&s->s_cap_lock);
- s->s_recon_gen = 0;
s->s_cap_gen = 0;
s->s_cap_ttl = 0;
s->s_renew_requested = 0;
@@ -736,25 +735,14 @@
static int wake_up_session_cb(struct inode *inode, struct ceph_cap *cap,
void *arg)
{
- struct ceph_mds_session *session = arg;
-
- spin_lock(&inode->i_lock);
- if (cap->recon_gen != session->s_recon_gen) {
- pr_err("failed reconnect %p %llx.%llx cap %p "
- "(recon_gen %d < session %d)\n", inode,
- ceph_vinop(inode), cap,
- cap->recon_gen, session->s_recon_gen);
- __ceph_remove_cap(cap, NULL);
- }
wake_up(&ceph_inode(inode)->i_cap_wq);
- spin_unlock(&inode->i_lock);
return 0;
}
static void wake_up_session_caps(struct ceph_mds_session *session)
{
dout("wake_up_session_caps %p mds%d\n", session, session->s_mds);
- iterate_session_caps(session, wake_up_session_cb, session);
+ iterate_session_caps(session, wake_up_session_cb, NULL);
}
/*
@@ -2052,7 +2040,6 @@
session->s_state = CEPH_MDS_SESSION_RECONNECTING;
session->s_seq = 0;
- session->s_recon_gen++;
ceph_con_open(&session->s_con,
ceph_mdsmap_get_addr(mdsc->mdsmap, mds));