4 files changed, 29 insertions, 5 deletions

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 650d2db5ed26..4b1a7a4bae0b 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -888,13 +888,22 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry,
 
                 /* ensure target dentry is invalidated, despite
                    rehashing bug in vfs_rename_dir */
-                new_dentry->d_time = jiffies;
-                ceph_dentry(new_dentry)->lease_shared_gen = 0;
+                ceph_invalidate_dentry_lease(new_dentry);
         }
         ceph_mdsc_put_request(req);
         return err;
 }
 
+/*
+ * Ensure a dentry lease will no longer revalidate.
+ */
+void ceph_invalidate_dentry_lease(struct dentry *dentry)
+{
+        spin_lock(&dentry->d_lock);
+        dentry->d_time = jiffies;
+        ceph_dentry(dentry)->lease_shared_gen = 0;
+        spin_unlock(&dentry->d_lock);
+}
 
 /*
  * Check if dentry lease is valid.  If not, delete the lease.  Try to
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 85b4d2ffdeba..220a2aec0545 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -938,8 +938,15 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req,
                                 ceph_inode(req->r_locked_dir);
                         dout(" clearing %p complete (empty trace)\n",
                              req->r_locked_dir);
+                        spin_lock(&req->r_locked_dir->i_lock);
                         ci->i_ceph_flags &= ~CEPH_I_COMPLETE;
                         ci->i_release_count++;
+                        spin_unlock(&req->r_locked_dir->i_lock);
+
+                        if (req->r_dentry)
+                                ceph_invalidate_dentry_lease(req->r_dentry);
+                        if (req->r_old_dentry)
+                                ceph_invalidate_dentry_lease(req->r_old_dentry);
                 }
                 return 0;
         }
@@ -1011,13 +1018,15 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req,
                              req->r_old_dentry->d_name.len,
                              req->r_old_dentry->d_name.name,
                              dn, dn->d_name.len, dn->d_name.name);
+
                         /* ensure target dentry is invalidated, despite
                            rehashing bug in vfs_rename_dir */
-                        dn->d_time = jiffies;
-                        ceph_dentry(dn)->lease_shared_gen = 0;
+                        ceph_invalidate_dentry_lease(dn);
+
                         /* take overwritten dentry's readdir offset */
                         ceph_dentry(req->r_old_dentry)->offset =
                                 ceph_dentry(dn)->offset;
+
                         dn = req->r_old_dentry;  /* use old_dentry */
                         in = dn->d_inode;
                 }
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index c0568fe3c0ba..76995a960432 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1732,12 +1732,17 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc,
                         struct ceph_inode_info *ci =
                                 ceph_inode(req->r_locked_dir);
 
-                        dout("aborted, clearing I_COMPLETE on %p\n",
+                        dout("aborted, clearing I_COMPLETE on %p, leases\n",
                              req->r_locked_dir);
                         spin_lock(&req->r_locked_dir->i_lock);
                         ci->i_ceph_flags &= ~CEPH_I_COMPLETE;
                         ci->i_release_count++;
                         spin_unlock(&req->r_locked_dir->i_lock);
+
+                        if (req->r_dentry)
+                                ceph_invalidate_dentry_lease(req->r_dentry);
+                        if (req->r_old_dentry)
+                                ceph_invalidate_dentry_lease(req->r_old_dentry);
                 }
         } else {
                 err = req->r_err;
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 13513b80d87f..cfe3b0834d54 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -871,6 +871,7 @@ extern struct dentry *ceph_finish_lookup(struct ceph_mds_request *req,
 extern void ceph_dentry_lru_add(struct dentry *dn);
 extern void ceph_dentry_lru_touch(struct dentry *dn);
 extern void ceph_dentry_lru_del(struct dentry *dn);
+extern void ceph_invalidate_dentry_lease(struct dentry *dentry);
 
 /*
  * our d_ops vary depending on whether the inode is live,