Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-01 10:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfs: spread struct mount - is_path_reachable

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-11-24 22:00:28 -05:00
parent 676da58df7
commit 643822b41e
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/namespace.c
View File

@ -2559,21 +2559,21 @@ SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
* *
* namespace_sem or vfsmount_lock is held * namespace_sem or vfsmount_lock is held
*/ */
bool is_path_reachable(struct vfsmount *mnt, struct dentry *dentry, bool is_path_reachable(struct mount *mnt, struct dentry *dentry,
const struct path *root) const struct path *root)
{ {
while (mnt != root->mnt && mnt_has_parent(real_mount(mnt))) { while (&mnt->mnt != root->mnt && mnt_has_parent(mnt)) {
dentry = mnt->mnt_mountpoint; dentry = mnt->mnt.mnt_mountpoint;
mnt = mnt->mnt_parent; mnt = real_mount(mnt->mnt.mnt_parent);
} }
return mnt == root->mnt && is_subdir(dentry, root->dentry); return &mnt->mnt == root->mnt && is_subdir(dentry, root->dentry);
} }
int path_is_under(struct path *path1, struct path *path2) int path_is_under(struct path *path1, struct path *path2)
{ {
int res; int res;
br_read_lock(vfsmount_lock); br_read_lock(vfsmount_lock);
res = is_path_reachable(path1->mnt, path1->dentry, path2); res = is_path_reachable(real_mount(path1->mnt), path1->dentry, path2);
br_read_unlock(vfsmount_lock); br_read_unlock(vfsmount_lock);
return res; return res;
} }
@ -2659,7 +2659,7 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
if (!mnt_has_parent(new_mnt)) if (!mnt_has_parent(new_mnt))
goto out4; /* not attached */ goto out4; /* not attached */
/* make sure we can reach put_old from new_root */ /* make sure we can reach put_old from new_root */
if (!is_path_reachable(old.mnt, old.dentry, &new)) if (!is_path_reachable(real_mount(old.mnt), old.dentry, &new))
goto out4; goto out4;
br_write_lock(vfsmount_lock); br_write_lock(vfsmount_lock);
detach_mnt(new_mnt, &parent_path); detach_mnt(new_mnt, &parent_path);

10
fs/pnode.c
View File

@ -32,15 +32,15 @@ static struct vfsmount *get_peer_under_root(struct vfsmount *mnt,
struct mnt_namespace *ns, struct mnt_namespace *ns,
const struct path *root) const struct path *root)
{ {
struct vfsmount *m = mnt; struct mount *m = real_mount(mnt);
do { do {
/* Check the namespace first for optimization */ /* Check the namespace first for optimization */
if (m->mnt_ns == ns && is_path_reachable(m, m->mnt_root, root)) if (m->mnt.mnt_ns == ns && is_path_reachable(m, m->mnt.mnt_root, root))
return m; return &m->mnt;
m = next_peer(m); m = real_mount(next_peer(&m->mnt));
} while (m != mnt); } while (&m->mnt != mnt);
return NULL; return NULL;
} }

2
fs/pnode.h
View File

@ -42,6 +42,6 @@ void mnt_set_mountpoint(struct vfsmount *, struct dentry *,
void release_mounts(struct list_head *); void release_mounts(struct list_head *);
void umount_tree(struct mount *, int, struct list_head *); void umount_tree(struct mount *, int, struct list_head *);
struct mount *copy_tree(struct mount *, struct dentry *, int); struct mount *copy_tree(struct mount *, struct dentry *, int);
bool is_path_reachable(struct vfsmount *, struct dentry *, bool is_path_reachable(struct mount *, struct dentry *,
const struct path *root); const struct path *root);
#endif /* _LINUX_PNODE_H */ #endif /* _LINUX_PNODE_H */