Skip to content

L
linux-davinci
Commit bec1052e authored by Al Viro's avatar Al Viro
Browse files
Options

set S_DEAD on unlink() and non-directory rename() victims 

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent db1f05bb
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
fs/namei.c
View file @ bec1052e
...@@ -2262,8 +2262,11 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry) ...@@ -2262,8 +2262,11 @@ int vfs_unlink(struct inode *dir, struct dentry *dentry)
error = -EBUSY; error = -EBUSY;
else { else {
error = security_inode_unlink(dir, dentry); error = security_inode_unlink(dir, dentry);
if (!error) if (!error) {
error = dir->i_op->unlink(dir, dentry); error = dir->i_op->unlink(dir, dentry);
if (!error)
dentry->d_inode->i_flags |= S_DEAD;
}
} }
mutex_unlock(&dentry->d_inode->i_mutex); mutex_unlock(&dentry->d_inode->i_mutex);
...@@ -2616,6 +2619,8 @@ static int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry, ...@@ -2616,6 +2619,8 @@ static int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
else else
error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry); error = old_dir->i_op->rename(old_dir, old_dentry, new_dir, new_dentry);
if (!error) { if (!error) {
if (target)
target->i_flags |= S_DEAD;
if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE)) if (!(old_dir->i_sb->s_type->fs_flags & FS_RENAME_DOES_D_MOVE))
d_move(old_dentry, new_dentry); d_move(old_dentry, new_dentry);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment