Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 ee3efa91 编写于 作者: A Al Viro
浏览文件
操作

__d_unalias() should refuse to move mountpoints 

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
上级 e77fb7ce
显示空白变更内容
内联 并排
Showing with 5 addition and 4 deletion
fs/dcache.c
浏览文件 @ ee3efa91
...@@ -2387,14 +2387,13 @@ static struct dentry *__d_unalias(struct inode *inode, ...@@ -2387,14 +2387,13 @@ static struct dentry *__d_unalias(struct inode *inode,
struct dentry *dentry, struct dentry *alias) struct dentry *dentry, struct dentry *alias)
{ {
struct mutex *m1 = NULL, *m2 = NULL; struct mutex *m1 = NULL, *m2 = NULL;
struct dentry *ret; struct dentry *ret = ERR_PTR(-EBUSY);
/* If alias and dentry share a parent, then no extra locks required */ /* If alias and dentry share a parent, then no extra locks required */
if (alias->d_parent == dentry->d_parent) if (alias->d_parent == dentry->d_parent)
goto out_unalias; goto out_unalias;
/* See lock_rename() */ /* See lock_rename() */
ret = ERR_PTR(-EBUSY);
if (!mutex_trylock(&dentry->d_sb->s_vfs_rename_mutex)) if (!mutex_trylock(&dentry->d_sb->s_vfs_rename_mutex))
goto out_err; goto out_err;
m1 = &dentry->d_sb->s_vfs_rename_mutex; m1 = &dentry->d_sb->s_vfs_rename_mutex;
...@@ -2402,8 +2401,10 @@ static struct dentry *__d_unalias(struct inode *inode, ...@@ -2402,8 +2401,10 @@ static struct dentry *__d_unalias(struct inode *inode,
goto out_err; goto out_err;
m2 = &alias->d_parent->d_inode->i_mutex; m2 = &alias->d_parent->d_inode->i_mutex;
out_unalias: out_unalias:
if (likely(!d_mountpoint(alias))) {
__d_move(alias, dentry); __d_move(alias, dentry);
ret = alias; ret = alias;
}
out_err: out_err:
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
if (m2) if (m2)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或