summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin Labbe <clabbe.montjoie@gmail.com>2017-09-26 03:14:06 -0400
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)
55} 55}
56EXPORT_SYMBOL_GPL(locks_end_grace); 56EXPORT_SYMBOL_GPL(locks_end_grace);
57 57
58/**
59 * locks_in_grace
60 *
61 * Lock managers call this function to determine when it is OK for them
62 * to answer ordinary lock requests, and when they should accept only
63 * lock reclaims.
64 */
65static int 58static int
66__state_in_grace(struct net *net, bool open) 59__state_in_grace(struct net *net, bool open)
67{ 60{
@@ -78,6 +71,13 @@ __state_in_grace(struct net *net, bool open)
78 return false; 71 return false;
79} 72}
80 73
74/**
75 * locks_in_grace
76 *
77 * Lock managers call this function to determine when it is OK for them
78 * to answer ordinary lock requests, and when they should accept only
79 * lock reclaims.
80 */
81int locks_in_grace(struct net *net) 81int locks_in_grace(struct net *net)
82{ 82{
83 return __state_in_grace(net, 0); 83 return __state_in_grace(net, 0);