Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw

Conflicts:
	drivers/spi/spi-dw-mid.c

1 files changed, 1 insertions, 0 deletions

diff --git a/fs/pnode.c b/fs/pnode.c
index 302bf22c4a30..aae331a5d03b 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -381,6 +381,7 @@ static void __propagate_umount(struct mount *mnt)
                  * other children
                  */
                 if (child && list_empty(&child->mnt_mounts)) {
+                        list_del_init(&child->mnt_child);
                         hlist_del_init_rcu(&child->mnt_hash);
                         hlist_add_before_rcu(&child->mnt_hash, &mnt->mnt_hash);
                 }