From patchwork Tue Sep 26 07:14:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9971263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2A5D860365 for ; Tue, 26 Sep 2017 07:17:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFAF01FEBD for ; Tue, 26 Sep 2017 07:17:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B440523B3C; Tue, 26 Sep 2017 07:17:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE99424BFE for ; Tue, 26 Sep 2017 07:17:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966271AbdIZHRU (ORCPT ); Tue, 26 Sep 2017 03:17:20 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35997 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966733AbdIZHQU (ORCPT ); Tue, 26 Sep 2017 03:16:20 -0400 Received: by mail-wr0-f196.google.com with SMTP id g50so1679976wra.3; Tue, 26 Sep 2017 00:16:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xe/9KyxWI6oLzv1hGp/8mb8gRSGJsqGekXip10muxUM=; b=NsJJVZrmqcbqZMpQ0DkW+BlERuqTfTAPCDFwDgDMOYZCNIX8JtF2kv3zwYQZQ4jEN2 6VAqs1WkhGjZiB/3XuAdB/PRaS+LdPJwUXjFWACOY5BF6n2bFvBmnmmhY0pUyLpDMesr ZUdfkr1ErFucW7YaPizVCVJomW8ApQttFS10P9xRo8veRBZLbQsb7K0W/nx5cgCliNHI MOJY4hL5txPNGw4WS0NX7+s+tx1E4kBiZmKfNlSo4XLFfmq5clZ/f2mGxSVYS3DwLNs/ shvbV8JOwQRvwpTQvaKdnCAAceZXZkSJWhbTtgg9Io711UA0ysh8TFoDBS5x7XXr7PXC dU9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xe/9KyxWI6oLzv1hGp/8mb8gRSGJsqGekXip10muxUM=; b=mzp/4n6pKvV9L/El3CqUPVxFmJN9EZ1WorS0G1WQUNgiGOvVPFX9BS6DCwv8GOWSq+ DwXd42octMAu1Q2M2mfJSmdgA4VslI0jy7iFjfXeeoiZylwZUVYYi90/uk+ZcV8pdrPf vcgVxQC5ZizkWa7c/WZF0HdLnYbAZAhj5DoTxguYVvgcLMepHT8uCQ9409OX2blOfLMc Vcoj1U9tj40PQbyYrxbO/q1eXUdt8HveAls/fHf5nd9nwlPzw8JMme3Ua5sPXaN8DvTa hmfCrAdAx+qVMyBULbWsvq1BdVxjWPvW3NFYPl5vegeTPL/kygp/Cr8Zl/Twi8Y9UOGO Ig5g== X-Gm-Message-State: AHPjjUg4NWfnE1+DF4czBTjXywOQou/4PUklpLLb1I8Ezbft59Nv8zou jXw3xiI3d7zgEivNEF/OW1s2oFOr X-Google-Smtp-Source: AOwi7QCKg/G+3e3AQM2nfWx0uWs4jWSFtcUBDQ6sHqEQrYt7DXhgwX51nEg3gdJa0BqnDekYbPjLDw== X-Received: by 10.223.166.99 with SMTP id k90mr7095115wrc.183.1506410178739; Tue, 26 Sep 2017 00:16:18 -0700 (PDT) Received: from Red.local (LFbn-MAR-1-580-96.w90-118.abo.wanadoo.fr. [90.118.159.96]) by smtp.googlemail.com with ESMTPSA id l91sm11640031wrc.16.2017.09.26.00.16.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 00:16:18 -0700 (PDT) From: Corentin Labbe To: trond.myklebust@primarydata.com, anna.schumaker@netapp.com, bfields@fieldses.org, jlayton@poochiereds.net, viro@zeniv.linux.org.uk Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Corentin Labbe Subject: [PATCH 2/3] nfs_common: move locks_in_grace comment at the right place Date: Tue, 26 Sep 2017 09:14:06 +0200 Message-Id: <20170926071407.31719-3-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170926071407.31719-1-clabbe.montjoie@gmail.com> References: <20170926071407.31719-1-clabbe.montjoie@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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);