summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorentin Labbe <clabbe.montjoie@gmail.com>2017-09-26 09:14:06 +0200
committerJ. Bruce Fields <bfields@redhat.com>2017-09-26 09:25:34 -0400
commit809d4fcf9dd593af6d11ab1e6f0efc9fcfefb682 (patch)
tree4f43e1628ffa47f5ef70e7e5117a4d5a18144661
parent033c006e5fe08233014d449715171f07e68a4a3a (diff)
nfs_common: move locks_in_grace comment at the right place
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> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfs_common/grace.c14
1 files 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);