summaryrefslogtreecommitdiffstats
path: root/fs/namespace.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2008-11-12 13:26:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-12 17:17:17 -0800
commitafef80b3d87cae574b8c6b763505f25b74d254ef (patch)
tree4aaa479b3bfc635c3cb28530c8cb01c87fc04bde /fs/namespace.c
parent8891d6da17db0f9bb507d3a017f130b9970c3087 (diff)
downloadop-kernel-dev-afef80b3d87cae574b8c6b763505f25b74d254ef.zip
op-kernel-dev-afef80b3d87cae574b8c6b763505f25b74d254ef.tar.gz
vfs: fix shrink_submounts
In the last refactoring of shrink_submounts a variable was not completely renamed. So finish the renaming of mnt to m now. Without this if you attempt to mount an nfs mount that has both automatic nfs sub mounts on it, and has normal mounts on it. The unmount will succeed when it should not. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: Al Viro <viro@ZenIV.linux.org.uk Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r--fs/namespace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index cce4670..65b3dc8 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1815,8 +1815,8 @@ static void shrink_submounts(struct vfsmount *mnt, struct list_head *umounts)
while (!list_empty(&graveyard)) {
m = list_first_entry(&graveyard, struct vfsmount,
mnt_expire);
- touch_mnt_namespace(mnt->mnt_ns);
- umount_tree(mnt, 1, umounts);
+ touch_mnt_namespace(m->mnt_ns);
+ umount_tree(m, 1, umounts);
}
}
}
OpenPOWER on IntegriCloud