From patchwork Tue Sep 26 07:14:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 114228 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp3508209qgf; Tue, 26 Sep 2017 00:16:34 -0700 (PDT) X-Received: by 10.99.126.84 with SMTP id o20mr10075595pgn.129.1506410193921; Tue, 26 Sep 2017 00:16:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506410193; cv=none; d=google.com; s=arc-20160816; b=KQVgmHn4Pjd571SL6znZzNITqtvM/Klh3C3fUIByA7nynDarew+hN7YuK7MYzUPFoR Wq/GRPnL8DomXIv+r9YqrD2ox9GMxvya9n3+jXRqPEEuGwaVdrFH1c3AyjdfuRGhg3rG d5K7yILUDYqCKrz8L4Dm41/jHj+l4cr9qNpxJQxt5lK/XEnL7icCyhYVWWAgCC3WRtXy ivX93g2VVi44R3ockKkU0p5Eqb1LvyLEvL6OvIRVNCUwUhvFdJernrNdWXf3mHanBO+v TtCYG5MYJ0xJQEqOe3AIcRT+vEAiMxZ7nppMfAzjxhIuyXKGgbD82FlSMOTvE9qLG5F1 QfYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=WyTAeIJn3vQYbVC+udiZYWPiDFSO7bj5h9marWQm3tI=; b=uiyHb4txSu+PbKsWtXqg7Ccskt1b6TocGPic2VJu9DMVJDpGJwU4+cHsBvYKXPlWJu zMh4iC7aKbGkxQ1mCSY/6InUF35UzcCpYVY1LpT+BBFcDnb58TVKmCrtH2RvbyN82OWn GVdl0mQwZGItUnNKaA6nAfsb1COwtRQgFxUz/qzH5rucxG+LcWc6RUEYuo46T1qYHL4y GrvYnQzdkMcP+MAqVL5as7WOL/pfXueP+3qfPHAJH4yZmkiSO+ZAUQUNE0ROuTJ17OKD 6x+Qj8L6x5h0ZOqflAH3OkTkJ3AptN/XQ//LGEsTwO20Gd0epql7jfImEVMO8PBuo3Yd ztdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=tHZIL3XS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v126si5226906pfv.10.2017.09.26.00.16.33; Tue, 26 Sep 2017 00:16:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=tHZIL3XS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966894AbdIZHQa (ORCPT + 26 others); Tue, 26 Sep 2017 03:16:30 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34725 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966725AbdIZHQT (ORCPT ); Tue, 26 Sep 2017 03:16:19 -0400 Received: by mail-wm0-f65.google.com with SMTP id i131so8576153wma.1; Tue, 26 Sep 2017 00:16:18 -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=WyTAeIJn3vQYbVC+udiZYWPiDFSO7bj5h9marWQm3tI=; b=tHZIL3XS2Fiw1EpWQ2KQlgS77Q/mWeNSSAODx7DFUoTXXFo+9EIU4gJzRgBy7+OwdF aYAGjwsg+1YibupKtxI2/R34fbMASQRtWCbK7fkmf3it8Ydf4MwStb1z3Mr7NN2Lm1ep 9Aspw8dUXRgAY2lV1NSWGniWkLZGfjsVuy37QB13AUJhCEYjfPM1uynKhAYfx/5O3050 7WVC0vz31fsyeKOgsfs3JEMaJHy2UFsInaOs/Oz6Oj6MZ76nTRv+ZodUOqJGUkhnlH/j bAXEFsr413gYTBViyfF8qDBUSh25CAIy1KF6a8UXcUckGka/8oS7kbaIn7bWJsR9YZmv TNlA== 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=WyTAeIJn3vQYbVC+udiZYWPiDFSO7bj5h9marWQm3tI=; b=dKh9UC0Yv6BE3AvrDMcv+hV3BTnU/wLQ2PzZRFCCCPzPlykZE7/+5++WYJNwR9DGCe ejOYRPM0bq9M/scGkcvCi1nHBRBWwidruoJTWHN38rohECDBk8kOlQl4u3cw4jgXJftN KSqAyrPlSdwkk4q9FgSghFd3P0/iCHoIOkw6AbT3hyaJghK8XeNEIVMy3TMI4+bVL7QN +qrPUtrL/KMvYsJkFdtzbZpkCN8aw2POfBtiSk0VIgs+Cei04OElraU719NpqH5i/adm FyHbJzovimo7o66WbsfHNca732b2w7AKD8p3fSBKcwGNjD2MA8Hno421WFwMMCjo8Yi8 tnzw== X-Gm-Message-State: AHPjjUi2lbOiV+VnNmVzwERzD+N3IHQHiqhhPnIDj5MTpFLR40eTu86g T9SGHRJlOMhCKYzCRKN/MWA= X-Google-Smtp-Source: AOwi7QBVWk8N8RKtNSllAYdCvtrBKZh6U08jEcwQXDSbt+VyWnBTCrJq1M4jQsUUijxNnSw8cBv2BA== X-Received: by 10.28.129.23 with SMTP id c23mr2580548wmd.27.1506410177753; Tue, 26 Sep 2017 00:16:17 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 00:16:17 -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 1/3] nfs_common: fix build warning in grace.c Date: Tue, 26 Sep 2017 09:14:05 +0200 Message-Id: <20170926071407.31719-2-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This fix the following warning fs/nfs_common/grace.c:66:1: warning: no previous prototype for function '__state_in_grace' [-Wmissing-prototypes] by adding the missing static. Signed-off-by: Corentin Labbe --- fs/nfs_common/grace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.5 diff --git a/fs/nfs_common/grace.c b/fs/nfs_common/grace.c index 420d3a0ab258..519396967e79 100644 --- a/fs/nfs_common/grace.c +++ b/fs/nfs_common/grace.c @@ -62,7 +62,7 @@ EXPORT_SYMBOL_GPL(locks_end_grace); * to answer ordinary lock requests, and when they should accept only * lock reclaims. */ -int +static int __state_in_grace(struct net *net, bool open) { struct list_head *grace_list = net_generic(net, grace_net_id); 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: 114230 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp3508908qgf; Tue, 26 Sep 2017 00:17:23 -0700 (PDT) X-Received: by 10.99.119.195 with SMTP id s186mr10224064pgc.263.1506410243882; Tue, 26 Sep 2017 00:17:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506410243; cv=none; d=google.com; s=arc-20160816; b=fUWBwdGS1FCbmUTCZZYiMmAkD+MB3O0+/11SzmUDU+HCdAKu7MoBkgjuZE2O2dpRJ2 bh3Q3bkaOYZILbMNezgDplb7zURpaRrT+lID1P52K+aJEbbXrZAWtzUIdYaLWpr4aDw9 ltKYGtPy9zVmvSXaTXwPfY3q7de5c6jMB5GeZONE0tjwUS+maGDbShrpCzRwocAfB0Ze iLAp5dB4e/7I+4AC+aGZM/cmlctboXe/0kPKvOwXO+MHbtBSYmupGhshe6Et4CaoUwi2 mB7j9B4h/JQtnyzlT9FP7pphXHeLZPqy4huFVf+OQ1MTrQeRYyjn9+b4CiM79ekg71Nk bKIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=xe/9KyxWI6oLzv1hGp/8mb8gRSGJsqGekXip10muxUM=; b=jEZulVAqb1N31nliONKfJpiIOGg7aas3LAi86EXjAO/xZj9KMeAdxCasnxDlb/0cKd BEBRZJlk4kuh+AfRssFbgNlrOEJ++dB89JoN9d1rsgTITs7/o+j13jOo7hKfhJ9XKJ3y GKB4SOoIqO8hoo996SnK4ZoWeEVB+94wO347nZcO5pfpZF/S9mEHlhj/fRG2dbRYLPeh xBdTrTUDiKAMuZt+J0Mzx5zVHKnvq9jS2ymKFA44coUQGIlxDWGKJP+eLvGqE7R58r2h TPcYOFVygATVX4eV1VcS7OZGYaTaSk6AXLY/psz1vUq56D/06Plh40ofkVbPjiF+zNqT wltg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=NsJJVZrm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o13si5468261pli.560.2017.09.26.00.17.23; Tue, 26 Sep 2017 00:17:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=NsJJVZrm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966967AbdIZHRV (ORCPT + 26 others); Tue, 26 Sep 2017 03:17:21 -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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.13.5 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); From patchwork Tue Sep 26 07:14:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 114229 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp3508612qgf; Tue, 26 Sep 2017 00:17:02 -0700 (PDT) X-Received: by 10.98.130.200 with SMTP id w191mr10099222pfd.246.1506410222783; Tue, 26 Sep 2017 00:17:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506410222; cv=none; d=google.com; s=arc-20160816; b=UdFhRdEX8Of7TA42r7c1JTBOIgwt9thcM3gDNsBcWms2cjrLOEJ+TFonldCREWO82W cX7PgGpkjl7eJaQDaYbfEhhIJVFdiXju17Gxc4LkW4xnjSB8dnr/l4JBLGlIyZHzLR4N Qm10po9bi5DIrskMt3T6TmVKQS+FMQVqxTVpRcfg9fbzWKJAQFTulETgHfxpQrm+Ky+V llIxjxCvMt5IgUNqnGMgKl0LjresEqCDqRMKWpsLOGZkjcpcaxA4Hy2RnS4fxSBEcjFO NqfHAynBN/bgAEsYSP9tDun11C/tIUHwdlc/NSrJU5OXZCWuZxG4NyUOv0tUaR5GP47d UMBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=OnExeZ2vbTAGagWZT0QqaRGUEXrQ6Hi+mvK5HKGP30Q=; b=ZNg4Guy0ELf3af6wkttcJLYIud6Mhd+Om5Av9XSozMQuXezOnHl3frRF0KuVyjmxht Gn8/1Oz45Cr5xsjcZKmaqo1lzAObRDPv9a4JruPtYL6hWO6wbWC2JnNFIdMfmgZnu+LG Fj5hR639GWEiyuoitFbHYRXycWfldYmkUJ+rGZtRJKqTdLW5JjyR7DSI+5IVVNSEuPm0 1AacFN2nAmBNzz48DDphC84S+Xq+htsQ3MZaJugFuLPrx84B44Pt1ca+AZurXNuGFcBv 9TOc0Lm8oga4t0NigZe+XxJS9lKZ8yVvxd/fNNdGjLjfbUNNABUJ2ZeNSHiqChE13WuK 2bSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=sh1ggmQt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f4si5414798pgq.72.2017.09.26.00.17.02; Tue, 26 Sep 2017 00:17:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=sh1ggmQt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966957AbdIZHRA (ORCPT + 26 others); Tue, 26 Sep 2017 03:17:00 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:50928 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966745AbdIZHQV (ORCPT ); Tue, 26 Sep 2017 03:16:21 -0400 Received: by mail-wm0-f65.google.com with SMTP id b195so4355318wmb.5; Tue, 26 Sep 2017 00:16:20 -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=OnExeZ2vbTAGagWZT0QqaRGUEXrQ6Hi+mvK5HKGP30Q=; b=sh1ggmQtyhor+drjFEN+Oq49n/aUSOQooBZJVGlHJ9MbkYzY04CGlwJpzuA6kLH42r oRWVia/LVT/6wqqjw/alGpEq3XQ7mSlJp5gq9arr/suO18qZrDoY+UvbpVL1xoqKPyb9 DFwTGmR0F6c59X9O6cCa93l+T211oFfr5araPk+5eCpGywKtbJEvzaVfmeNPOVDqxz3v F+QQY3thhhFI4gR6Q2EnDzvA9+PHzZKUUBi4ZjqQ0QYykMnItvZlNBQT5wzVP3DeKNz/ 39XbjZAe5FWGkUQTpdq82wj7N4IsafXi9AvRwchK78uFC82x/BmO8xuPleYg1MM21fkA atCg== 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=OnExeZ2vbTAGagWZT0QqaRGUEXrQ6Hi+mvK5HKGP30Q=; b=sQDU1pO/SCPUTurCOhxvkqByKPliCEBsFtveUu2qz5NGhTkuZ6KKD9lDU1KyZB4IpE yefaDioRudE7zZCZjOGXkZhWP+uAt05T7qGPk6+z0073IDLo03XYhN0Y8NHmUZNpEOu8 c1j78xFCw7uS2C3mBP7ZzQJ1A/K9QF8rjQwPcScLipc/VVWqLUp2J9tYr0r+9HrRCc0+ Ef7NOg3t4lSvHr3HVCacDu4vxhXPYqzUGxgTzGemFTxWvIHyLfzncL/wu0vL+8GpfCT2 6zHQxrwK5/8RIn6BDX+e35ncUqP106ByA8pLlxX1BUoEffs0mdgxOmXFUVXuEI8byjCx 4awg== X-Gm-Message-State: AHPjjUhpzQvOR90dx51Kn25QTmdnAZkZ82UFMN1EBkBwfHvYtUJdOTKM 1XCKxdibv6rLGKF4BIO8hO4= X-Google-Smtp-Source: AOwi7QA7Qb58rnydLA/jJZScmiaovPc3G9otn5k3OUWCCjot5MwQfcCTHvK1mBKHGoUODio3SGhYPw== X-Received: by 10.28.175.197 with SMTP id y188mr1989817wme.20.1506410179639; Tue, 26 Sep 2017 00:16:19 -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.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 00:16:19 -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 3/3] nfs_common: convert int to bool Date: Tue, 26 Sep 2017 09:14:07 +0200 Message-Id: <20170926071407.31719-4-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since __state_in_grace return only true/false, make it return bool instead of int. Same change for the two user of it, locks_in_grace/opens_in_grace Signed-off-by: Corentin Labbe --- fs/nfs_common/grace.c | 10 +++++----- include/linux/fs.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- 2.13.5 diff --git a/fs/nfs_common/grace.c b/fs/nfs_common/grace.c index c030cd618b99..897b299db55e 100644 --- a/fs/nfs_common/grace.c +++ b/fs/nfs_common/grace.c @@ -55,7 +55,7 @@ locks_end_grace(struct lock_manager *lm) } EXPORT_SYMBOL_GPL(locks_end_grace); -static int +static bool __state_in_grace(struct net *net, bool open) { struct list_head *grace_list = net_generic(net, grace_net_id); @@ -78,15 +78,15 @@ __state_in_grace(struct net *net, bool open) * to answer ordinary lock requests, and when they should accept only * lock reclaims. */ -int locks_in_grace(struct net *net) +bool locks_in_grace(struct net *net) { - return __state_in_grace(net, 0); + return __state_in_grace(net, false); } EXPORT_SYMBOL_GPL(locks_in_grace); -int opens_in_grace(struct net *net) +bool opens_in_grace(struct net *net) { - return __state_in_grace(net, 1); + return __state_in_grace(net, true); } EXPORT_SYMBOL_GPL(opens_in_grace); diff --git a/include/linux/fs.h b/include/linux/fs.h index 8a84a45ecbf9..df843e8c9b50 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -970,8 +970,8 @@ struct lock_manager { struct net; void locks_start_grace(struct net *, struct lock_manager *); void locks_end_grace(struct lock_manager *); -int locks_in_grace(struct net *); -int opens_in_grace(struct net *); +bool locks_in_grace(struct net *); +bool opens_in_grace(struct net *); /* that will die - we need it for nfs_lock_info */ #include