From a9c44d5afc18c699244da1adbb12e0df2875d874 Mon Sep 17 00:00:00 2001
From: Thierry Strudel <tstrudel@google.com>
Date: Sat, 11 Jul 2015 22:45:44 -0700
Subject: [PATCH] Revert "vfs: umount_tree() might be called on subtree that
had never made it"
This reverts commit 61fc3d0b2f95e232c7e4021b9e15790377efb80b.
---
fs/namespace.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/namespace.c b/fs/namespace.c
index 4e465397e456..e6081996c9a2 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1073,9 +1073,8 @@ void umount_tree(struct mount *mnt, int propagate, struct list_head *kill)
list_del_init(&p->mnt_expire);
list_del_init(&p->mnt_list);
__touch_mnt_namespace(p->mnt_ns);
- if (p->mnt_ns)
- __mnt_make_shortterm(p);
p->mnt_ns = NULL;
+ __mnt_make_shortterm(p);
list_del_init(&p->mnt_child);
if (mnt_has_parent(p)) {
p->mnt_parent->mnt_ghosts++;
--
GitLab