diff --git a/fs/namespace.c b/fs/namespace.c
index 4e465397e45609f6cca3532d2cc15f434b8841c5..e6081996c9a2f9d26525740545445630c4737583 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++;