All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kinglong Mee <kinglongmee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>,
	"J. Bruce Fields"
	<bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>,
	"linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
	<linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: NeilBrown <neilb-l3A5Bk7waGM@public.gmane.org>,
	Trond Myklebust
	<trond.myklebust-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org>,
	kinglongmee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Subject: [PATCH 3/6 v5] fs_pin: Kill fs_pin under a reference of vfsmnt
Date: Wed, 17 Jun 2015 15:51:22 +0800	[thread overview]
Message-ID: <558126FA.8050608@gmail.com> (raw)
In-Reply-To: <5581266C.9080404-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

v5, new patch

Signed-off-by: Kinglong Mee <kinglongmee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 fs/namespace.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/fs/namespace.c b/fs/namespace.c
index 1b9e111..3f08a48 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1049,8 +1049,6 @@ static void cleanup_mnt(struct mount *mnt)
 	 * so mnt_get_writers() below is safe.
 	 */
 	WARN_ON(mnt_get_writers(mnt));
-	if (unlikely(mnt->mnt_pins.first))
-		mnt_pin_kill(mnt);
 	fsnotify_vfsmount_delete(&mnt->mnt);
 	dput(mnt->mnt.mnt_root);
 	deactivate_super(mnt->mnt.mnt_sb);
@@ -1078,6 +1076,7 @@ static DECLARE_DELAYED_WORK(delayed_mntput_work, delayed_mntput);
 
 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 */
@@ -1090,6 +1089,13 @@ static void mntput_no_expire(struct mount *mnt)
 		unlock_mount_hash();
 		return;
 	}
+	if (unlikely(mnt->mnt_pins.first)) {
+		mnt_add_count(mnt, 1);
+		rcu_read_unlock();
+		unlock_mount_hash();
+		mnt_pin_kill(mnt);
+		goto put_again;
+	}
 	if (unlikely(mnt->mnt.mnt_flags & MNT_DOOMED)) {
 		rcu_read_unlock();
 		unlock_mount_hash();
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

WARNING: multiple messages have this Message-ID (diff)
From: Kinglong Mee <kinglongmee@gmail.com>
To: Al Viro <viro@zeniv.linux.org.uk>,
	"J. Bruce Fields" <bfields@fieldses.org>,
	"linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>,
	linux-fsdevel@vger.kernel.org
Cc: NeilBrown <neilb@suse.de>,
	Trond Myklebust <trond.myklebust@primarydata.com>,
	kinglongmee@gmail.com
Subject: [PATCH 3/6 v5] fs_pin: Kill fs_pin under a reference of vfsmnt
Date: Wed, 17 Jun 2015 15:51:22 +0800	[thread overview]
Message-ID: <558126FA.8050608@gmail.com> (raw)
In-Reply-To: <5581266C.9080404@gmail.com>

v5, new patch

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
---
 fs/namespace.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/fs/namespace.c b/fs/namespace.c
index 1b9e111..3f08a48 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1049,8 +1049,6 @@ static void cleanup_mnt(struct mount *mnt)
 	 * so mnt_get_writers() below is safe.
 	 */
 	WARN_ON(mnt_get_writers(mnt));
-	if (unlikely(mnt->mnt_pins.first))
-		mnt_pin_kill(mnt);
 	fsnotify_vfsmount_delete(&mnt->mnt);
 	dput(mnt->mnt.mnt_root);
 	deactivate_super(mnt->mnt.mnt_sb);
@@ -1078,6 +1076,7 @@ static DECLARE_DELAYED_WORK(delayed_mntput_work, delayed_mntput);
 
 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 */
@@ -1090,6 +1089,13 @@ static void mntput_no_expire(struct mount *mnt)
 		unlock_mount_hash();
 		return;
 	}
+	if (unlikely(mnt->mnt_pins.first)) {
+		mnt_add_count(mnt, 1);
+		rcu_read_unlock();
+		unlock_mount_hash();
+		mnt_pin_kill(mnt);
+		goto put_again;
+	}
 	if (unlikely(mnt->mnt.mnt_flags & MNT_DOOMED)) {
 		rcu_read_unlock();
 		unlock_mount_hash();
-- 
2.4.3


  parent reply	other threads:[~2015-06-17  7:51 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-17  7:49 [PATCH 0/6 v5] NFSD: Pin to vfsmount for nfsd exports cache Kinglong Mee
2015-06-17  7:49 ` Kinglong Mee
     [not found] ` <5581266C.9080404-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-06-17  7:49   ` [PATCH 1/6 v5] fs_pin: Initialize value for fs_pin explicitly Kinglong Mee
2015-06-17  7:49     ` Kinglong Mee
2015-06-17  7:50   ` [PATCH 2/6 v5] fs_pin: Export functions for specific filesystem Kinglong Mee
2015-06-17  7:50     ` Kinglong Mee
2015-06-17  7:51   ` Kinglong Mee [this message]
2015-06-17  7:51     ` [PATCH 3/6 v5] fs_pin: Kill fs_pin under a reference of vfsmnt Kinglong Mee
     [not found]     ` <558126FA.8050608-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-06-19 20:29       ` J. Bruce Fields
2015-06-19 20:29         ` J. Bruce Fields
2015-06-25 14:14         ` Kinglong Mee
2015-06-19 20:44       ` Al Viro
2015-06-19 20:44         ` Al Viro
2015-06-17  7:52   ` [PATCH 4/6 v5] path: New helpers path_get_pin/path_put_unpin for path pin Kinglong Mee
2015-06-17  7:52     ` Kinglong Mee
2015-06-17  7:52   ` [PATCH 5/6 v5] sunrpc: New helper cache_force_expire for cache cleanup Kinglong Mee
2015-06-17  7:52     ` Kinglong Mee
2015-06-17  7:53   ` [PATCH 6/6 v5] nfsd: Allows user un-mounting filesystem where nfsd exports base on Kinglong Mee
2015-06-17  7:53     ` Kinglong Mee
2015-06-19 21:09     ` Al Viro
2015-06-19 21:09       ` Al Viro
2015-06-25 14:46       ` Kinglong Mee

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=558126FA.8050608@gmail.com \
    --to=kinglongmee-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org \
    --cc=linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=neilb-l3A5Bk7waGM@public.gmane.org \
    --cc=trond.myklebust-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org \
    --cc=viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.