From: Corentin Labbe <clabbe.montjoie@gmail.com>
To: trond.myklebust@primarydata.com, anna.schumaker@netapp.com,
bfields@fieldses.org, jlayton@poochiereds.net,
viro@zeniv.linux.org.uk
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org,
Corentin Labbe <clabbe.montjoie@gmail.com>
Subject: [PATCH 2/3] nfs_common: move locks_in_grace comment at the right place
Date: Tue, 26 Sep 2017 09:14:06 +0200 [thread overview]
Message-ID: <20170926071407.31719-3-clabbe.montjoie@gmail.com> (raw)
In-Reply-To: <20170926071407.31719-1-clabbe.montjoie@gmail.com>
Commit c87fb4a378f9 ("lockd: NLM grace period shouldn't block NFSv4 opens")
made the locks_in_grace() comment be in the wrong place.
This patch move this comment just at the right place.
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
---
fs/nfs_common/grace.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/nfs_common/grace.c b/fs/nfs_common/grace.c
index 519396967e79..c030cd618b99 100644
--- a/fs/nfs_common/grace.c
+++ b/fs/nfs_common/grace.c
@@ -55,13 +55,6 @@ locks_end_grace(struct lock_manager *lm)
}
EXPORT_SYMBOL_GPL(locks_end_grace);
-/**
- * locks_in_grace
- *
- * Lock managers call this function to determine when it is OK for them
- * to answer ordinary lock requests, and when they should accept only
- * lock reclaims.
- */
static int
__state_in_grace(struct net *net, bool open)
{
@@ -78,6 +71,13 @@ __state_in_grace(struct net *net, bool open)
return false;
}
+/**
+ * locks_in_grace
+ *
+ * Lock managers call this function to determine when it is OK for them
+ * to answer ordinary lock requests, and when they should accept only
+ * lock reclaims.
+ */
int locks_in_grace(struct net *net)
{
return __state_in_grace(net, 0);
--
2.13.5
next prev parent reply other threads:[~2017-09-26 7:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-26 7:14 [PATCH 0/3] nfs_common: misc patchs Corentin Labbe
2017-09-26 7:14 ` [PATCH 1/3] nfs_common: fix build warning in grace.c Corentin Labbe
2017-09-26 7:14 ` Corentin Labbe [this message]
2017-09-26 7:14 ` [PATCH 3/3] nfs_common: convert int to bool Corentin Labbe
2017-09-26 11:15 ` [PATCH 0/3] nfs_common: misc patchs Jeff Layton
2017-09-26 13:25 ` J. Bruce Fields
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=20170926071407.31719-3-clabbe.montjoie@gmail.com \
--to=clabbe.montjoie@gmail.com \
--cc=anna.schumaker@netapp.com \
--cc=bfields@fieldses.org \
--cc=jlayton@poochiereds.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
--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
all inboxes | Powered by JetHome®