From: Jeff Layton Date: Tue, 10 Apr 2012 15:08:48 +0000 (-0400) Subject: nfsd: don't use locks_in_grace to determine whether to call nfs4_grace_end X-Git-Tag: v3.5-rc1~20^2~20 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33dcc481eddc3f532732a9582095373fa5354369;p=pandora-kernel.git nfsd: don't use locks_in_grace to determine whether to call nfs4_grace_end It's possible that lockd or another lock manager might still be on the list after we call nfsd4_end_grace. If the laundromat thread runs again at that point, then we could end up calling nfsd4_end_grace more than once. That's not only inefficient, but calling nfsd4_recdir_purge_old more than once could be problematic. Fix this by adding a new global "grace_ended" flag and use that to determine whether we've already called nfsd4_grace_end. Signed-off-by: Jeff Layton Signed-off-by: J. Bruce Fields --- Reading git-diff-tree failed