diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-24 20:01:19 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:57:00 -0500 |
commit | cbbe362cd68441edf1ebbafeea1c8e09cce4a7f9 (patch) | |
tree | 4d15466ee85a8a57d330bc3af53854f5d108bc23 /fs/namespace.c | |
parent | 0fb54e50562d8d6f4b1a4517ba9783a9c7c5c2b7 (diff) |
vfs: spread struct mount - tree_contains_unbindable
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 64ae40c91079..91bd15d9b2cd 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -1845,10 +1845,10 @@ static int do_remount(struct path *path, int flags, int mnt_flags, | |||
1845 | return err; | 1845 | return err; |
1846 | } | 1846 | } |
1847 | 1847 | ||
1848 | static inline int tree_contains_unbindable(struct vfsmount *mnt) | 1848 | static inline int tree_contains_unbindable(struct mount *mnt) |
1849 | { | 1849 | { |
1850 | struct mount *p; | 1850 | struct mount *p; |
1851 | for (p = real_mount(mnt); p; p = next_mnt(p, mnt)) { | 1851 | for (p = mnt; p; p = next_mnt(p, &mnt->mnt)) { |
1852 | if (IS_MNT_UNBINDABLE(&p->mnt)) | 1852 | if (IS_MNT_UNBINDABLE(&p->mnt)) |
1853 | return 1; | 1853 | return 1; |
1854 | } | 1854 | } |
@@ -1902,7 +1902,7 @@ static int do_move_mount(struct path *path, char *old_name) | |||
1902 | * mount which is shared. | 1902 | * mount which is shared. |
1903 | */ | 1903 | */ |
1904 | if (IS_MNT_SHARED(path->mnt) && | 1904 | if (IS_MNT_SHARED(path->mnt) && |
1905 | tree_contains_unbindable(old_path.mnt)) | 1905 | tree_contains_unbindable(old)) |
1906 | goto out1; | 1906 | goto out1; |
1907 | err = -ELOOP; | 1907 | err = -ELOOP; |
1908 | for (p = path->mnt; mnt_has_parent(p); p = p->mnt_parent) | 1908 | for (p = path->mnt; mnt_has_parent(p); p = p->mnt_parent) |