aboutsummaryrefslogtreecommitdiff
path: root/fs/ceph/caps.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ceph/caps.c')
-rw-r--r--fs/ceph/caps.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 775e6f6fc97..d8132b6e770 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -610,7 +610,6 @@ retry:
cap->issue_seq = seq;
cap->mseq = mseq;
cap->cap_gen = session->s_cap_gen;
- cap->recon_gen = session->s_recon_gen;
if (fmode >= 0)
__ceph_get_fmode(ci, fmode);
@@ -627,21 +626,13 @@ retry:
static int __cap_is_valid(struct ceph_cap *cap)
{
unsigned long ttl;
- u32 gen, recon_gen;
+ u32 gen;
spin_lock(&cap->session->s_cap_lock);
gen = cap->session->s_cap_gen;
- recon_gen = cap->session->s_recon_gen;
ttl = cap->session->s_cap_ttl;
spin_unlock(&cap->session->s_cap_lock);
- if (cap->recon_gen != recon_gen) {
- dout("__cap_is_valid %p cap %p issued %s "
- "but DEAD (recon_gen %u vs %u)\n", &cap->ci->vfs_inode,
- cap, ceph_cap_string(cap->issued), cap->recon_gen,
- recon_gen);
- return 0;
- }
if (cap->cap_gen < gen || time_after_eq(jiffies, ttl)) {
dout("__cap_is_valid %p cap %p issued %s "
"but STALE (gen %u vs %u)\n", &cap->ci->vfs_inode,
@@ -2213,7 +2204,6 @@ restart:
issued |= implemented | __ceph_caps_dirty(ci);
cap->cap_gen = session->s_cap_gen;
- cap->recon_gen = session->s_recon_gen;
__check_cap_issue(ci, cap, newcaps);