Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 809d4fcf authored by Corentin Labbe's avatar Corentin Labbe Committed by J. Bruce Fields
Browse files

nfs_common: move locks_in_grace comment at the right place 



Commit c87fb4a3 ("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: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 033c006e

fs/nfs_common/grace.c

+7 −7
Original line number Diff line number Diff line
@@ -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);