From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Eric W. Biederman" Subject: [PATCH review 07/11] mnt: Simplify umount_tree Date: Mon, 5 Jan 2015 14:46:23 -0600 Message-ID: <1420490787-14387-7-git-send-email-ebiederm@xmission.com> References: <87mw5xq7lt.fsf@x220.int.ebiederm.org> Cc: , "Serge E. Hallyn" , Andy Lutomirski , Chen Hanxiao , Richard Weinberger , Andrey Vagin , Al Viro To: Linux Containers Return-path: Received: from out01.mta.xmission.com ([166.70.13.231]:59084 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753976AbbAEUtV (ORCPT ); Mon, 5 Jan 2015 15:49:21 -0500 In-Reply-To: <87mw5xq7lt.fsf@x220.int.ebiederm.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Replace the open coded __detach_mnt with __detach_mnt. Cc: stable@vger.kernel.org Signed-off-by: "Eric W. Biederman" --- fs/namespace.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index c3f526ce0522..9fae55f2242e 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1368,16 +1368,8 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how) if (how & UMOUNT_SYNC) p->mnt.mnt_flags |= MNT_SYNC_UMOUNT; if (mnt_has_parent(p)) { - hlist_del_init(&p->mnt_mp_list); - put_mountpoint(p->mnt_mp); mnt_add_count(p->mnt_parent, -1); - /* move the reference to mountpoint into ->mnt_ex_mountpoint */ - p->mnt_ex_mountpoint.dentry = p->mnt_mountpoint; - p->mnt_ex_mountpoint.mnt = &p->mnt_parent->mnt; - p->mnt_mountpoint = p->mnt.mnt_root; - p->mnt_parent = p; - p->mnt_mp = NULL; - hlist_del_init_rcu(&p->mnt_hash); + __detach_mnt(p, &p->mnt_ex_mountpoint); } change_mnt_propagation(p, MS_PRIVATE); } -- 2.2.1