Skip to content

Commit

Permalink
vfs: spread struct mount - tree_contains_unbindable
Browse files Browse the repository at this point in the history 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jan 4, 2012
1 parent 0fb54e5 commit cbbe362
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs/namespace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1845,10 +1845,10 @@ static int do_remount(struct path *path, int flags, int mnt_flags,
return err;
}

static inline int tree_contains_unbindable(struct vfsmount *mnt)
static inline int tree_contains_unbindable(struct mount *mnt)
{
struct mount *p;
for (p = real_mount(mnt); p; p = next_mnt(p, mnt)) {
for (p = mnt; p; p = next_mnt(p, &mnt->mnt)) {
if (IS_MNT_UNBINDABLE(&p->mnt))
return 1;
}
Expand Down Expand Up @@ -1902,7 +1902,7 @@ static int do_move_mount(struct path *path, char *old_name)
* mount which is shared.
*/
if (IS_MNT_SHARED(path->mnt) &&
tree_contains_unbindable(old_path.mnt))
tree_contains_unbindable(old))
goto out1;
err = -ELOOP;
for (p = path->mnt; mnt_has_parent(p); p = p->mnt_parent)
Expand Down

0 comments on commit cbbe362

Please sign in to comment.