Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1739600

[PATCH 2/3] nfs_common: move locks_in_grace comment at the right place

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/3] nfs_common: misc patchs Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-09-26 09:20 +0200
  [PATCH 2/3] nfs_common: move locks_in_grace comment at the right place Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-09-26 09:20 +0200
  [PATCH 3/3] nfs_common: convert int to bool Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-09-26 09:20 +0200
  [PATCH 1/3] nfs_common: fix build warning in grace.c Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-09-26 09:20 +0200
  Re: [PATCH 0/3] nfs_common: misc patchs Jeff Layton <jlayton@redhat.com> - 2017-09-26 13:20 +0200
    Re: [PATCH 0/3] nfs_common: misc patchs "J. Bruce Fields" <bfields@fieldses.org> - 2017-09-26 15:30 +0200

csiph-web