---

yaml --- r: 190531 b: refs/heads/master c: ea1409f h: refs/heads/master i: 190529: 483ed60 190527: 73bbcd9 v: v3
git-mirror · May 3, 2010 · af7fbac · af7fbac
1 parent 5b36b3b
commit af7fbac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c6a2cdb4fe8aaf6b54f022c14f13d2a12b45914
+refs/heads/master: ea1409f96197c1bffe5d7d5bc967b3445edcc1fa
diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c
@@ -880,7 +880,16 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry,
 		 * do_request, above).  If there is no trace, we need
 		 * to do it here.
 		 */
+
+		/* d_move screws up d_subdirs order */
+		ceph_i_clear(new_dir, CEPH_I_COMPLETE);
+
 		d_move(old_dentry, new_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_mdsc_put_request(req);
 	return err;