From 170d1186ec25b1e040d5e95f9e787d5b7200b7ed Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 24 Nov 2011 20:01:19 -0500 Subject: [PATCH] --- yaml --- r: 280171 b: refs/heads/master c: cbbe362cd68441edf1ebbafeea1c8e09cce4a7f9 h: refs/heads/master i: 280169: dcf10a095f537408268bace1901a9c2dd33dbf61 280167: 7d129194988824f9d343dbb2cc20276ea81bc48d v: v3 --- [refs] | 2 +- trunk/fs/namespace.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4486295d4531..48768e8e5dc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fb54e50562d8d6f4b1a4517ba9783a9c7c5c2b7 +refs/heads/master: cbbe362cd68441edf1ebbafeea1c8e09cce4a7f9 diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c index 64ae40c91079..91bd15d9b2cd 100644 --- a/trunk/fs/namespace.c +++ b/trunk/fs/namespace.c @@ -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; } @@ -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)