From 4fb7fb94c3b91a4469f5675de3f4efb5b9532ebc Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Sun, 13 Apr 2014 22:22:15 -0700 Subject: [PATCH] vfs: Remove useless loop in mntput_no_expire Remove the extra reference added to mnt_count by the mnt_pinned code, and stop jumping to the top of mntput_no_expire. When fput synchronously called mntput that extra reference count and the loop ensured that after acct_auto_close_mnt closed all of the pinned references mntput_no_expire would then proceed actually unmount the filesystem. As fput is asynchronous today there is no point in looping. Signed-off-by: "Eric W. Biederman" --- fs/namespace.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index 52f4174e294c..81086e46f1f7 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -955,7 +955,6 @@ static void delayed_free(struct rcu_head *head) static void mntput_no_expire(struct mount *mnt) { -put_again: rcu_read_lock(); mnt_add_count(mnt, -1); if (likely(mnt->mnt_ns)) { /* shouldn't be the last one */ @@ -969,12 +968,12 @@ put_again: return; } if (unlikely(mnt->mnt_pinned)) { - mnt_add_count(mnt, mnt->mnt_pinned + 1); + mnt_add_count(mnt, mnt->mnt_pinned); mnt->mnt_pinned = 0; rcu_read_unlock(); unlock_mount_hash(); acct_auto_close_mnt(&mnt->mnt); - goto put_again; + return; } if (unlikely(mnt->mnt.mnt_flags & MNT_DOOMED)) { rcu_read_unlock(); -- 2.39.5