---

yaml
---
r: 185731
b: refs/heads/master
c: bec1052
h: refs/heads/master
i:
  185729: 7b8433a
  185727: 3a939f9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db1f05bb85d7966b9176e293f3ceead1cb8b5d79
+refs/heads/master: bec1052e5be6a70f03f6adc650f3a6e4c2f44ddf

trunk/fs/namei.c

@@ -2262,8 +2262,11 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
 		error = -EBUSY;
 	else {
 		error = security_inode_unlink(dir, dentry);
-		if (!error)
+		if (!error) {
 			error = dir->i_op->unlink(dir, dentry);
+			if (!error)
+				dentry->d_inode->i_flags |= S_DEAD;
+		}
 	}
 	mutex_unlock(&dentry->d_inode->i_mutex);
 
@@ -2616,6 +2619,8 @@ static int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
 	else
 		error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
 	if (!error) {
+		if (target)
+			target->i_flags |= S_DEAD;
 		if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE))
 			d_move(old_dentry, new_dentry);
 	}