From: Ian Kent <raven@themaw.net>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: autofs mailing list <autofs@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/4] autofs: dont call do_expire_wait() in autofs_d_manage()
Date: Tue, 31 Mar 2020 07:06:51 +0800 [thread overview]
Message-ID: <158560961146.14841.14430383874338917674.stgit@mickey.themaw.net> (raw)
Calling do_expire_wait() in autofs_d_manage() isn't really necessary.
If in rcu-walk mode -ECHILD will be returned and if in ref-walk mode
and the dentry might be picked for expire (or is expiring) 0 will be
returned otherwise it waits for the expire.
But waiting is meant to be done in autofs_d_automount() so simplify
autofs_d_manage() by testing the expire status and returning only
what's needed.
Signed-off-by: Ian Kent <raven@themaw.net>
---
fs/autofs/root.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index 5aaa1732bf1e..a3b7c72a298d 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -410,9 +410,12 @@ static int autofs_d_manage(const struct path *path, bool rcu_walk)
return 0;
}
- /* Wait for pending expires */
- if (do_expire_wait(path, rcu_walk) == -ECHILD)
- return -ECHILD;
+ /* Check for (possible) pending expire */
+ if (ino->flags & AUTOFS_INF_WANT_EXPIRE) {
+ if (rcu_walk)
+ return -ECHILD;
+ return 0;
+ }
/*
* This dentry may be under construction so wait on mount
@@ -432,8 +435,6 @@ static int autofs_d_manage(const struct path *path, bool rcu_walk)
*/
struct inode *inode;
- if (ino->flags & AUTOFS_INF_WANT_EXPIRE)
- return 0;
if (path_is_mountpoint(path))
return 0;
inode = d_inode_rcu(dentry);
next reply other threads:[~2020-03-30 23:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 23:06 Ian Kent [this message]
2020-03-30 23:06 ` [PATCH 2/4] autofs: remove rcu_walk parameter from autofs_expire_wait() Ian Kent
2020-03-30 23:07 ` [PATCH 3/4] vfs: check for autofs expiring dentry in follow_automount() Ian Kent
2020-03-30 23:20 ` McIntyre, Vincent (CASS, Marsfield)
2020-03-31 0:22 ` Ian Kent
2020-03-30 23:07 ` [PATCH 4/4] autofs: add comment about autofs_mountpoint_changed() Ian Kent
-- strict thread matches above, loose matches on Subject: below --
2020-03-26 5:23 [PATCH 1/4] autofs: dont call do_expire_wait() in autofs_d_manage() Ian Kent
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=158560961146.14841.14430383874338917674.stgit@mickey.themaw.net \
--to=raven@themaw.net \
--cc=autofs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).