X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=fs%2Fnamespace.c;h=8862d50a5b65deaa34e5bc5940fe064a07d83a6e;hp=173d15a33bd77686b8485319afcaad98ee425489;hb=8e650253c454f059c6eb11f88f0dec0e897fc8e1;hpb=2c6ee636de01b3569731c1704cea14de98fdba2c

diff --git a/fs/namespace.c b/fs/namespace.c
index 173d15a33bd7..8862d50a5b65 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1244,8 +1244,9 @@ void umount_tree(struct vfsmount *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 (p->mnt_parent != p) {
 			p->mnt_parent->mnt_ghosts++;