Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 280171
b: refs/heads/master
c: cbbe362
h: refs/heads/master
i:
  280169: dcf10a0
  280167: 7d12919
v: v3
  • Loading branch information
Al Viro committed Jan 4, 2012
1 parent fe80cff commit 170d118
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0fb54e50562d8d6f4b1a4517ba9783a9c7c5c2b7
refs/heads/master: cbbe362cd68441edf1ebbafeea1c8e09cce4a7f9
6 changes: 3 additions & 3 deletions trunk/fs/namespace.c
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 170d118

Please sign in to comment.