Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp166250rwb; Mon, 26 Sep 2022 10:37:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7UqyvjMVNgaXqLa8n70/vRLI0mCbwbjzWVe7kgqWL6ewi3Hdu2P4QfcGmqmVJ7cyhEKM5M X-Received: by 2002:aa7:d449:0:b0:457:12e7:c2f6 with SMTP id q9-20020aa7d449000000b0045712e7c2f6mr11439149edr.357.1664213836196; Mon, 26 Sep 2022 10:37:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664213836; cv=none; d=google.com; s=arc-20160816; b=p875aWO8dh8PoTq95B5KVyfYIMQ0OTYBsBuG279wEhTl6quUsmWQoQKeYx61M4FEo4 ORdxfOx/07mME3e8yD91NJRZ6gJ9RbnDOmxLNMsAp1yuuXg3ZV3DOfdv6CE7axWGQG5n u7aB7nvEi/Hyo/3GOq5yxqbggpyt56iME42Uqjhkk5fKbE2c4iHRe9rnqSA4M2tiz7Y2 57j0wlPvSOQqnxcNgpdwFGGwLf/vLF3/16iMebp8/k2x0Y41AqverPbzsr3tOS6T3UfQ CC5L7lLL0TMzRjMRJ+3mGM8VhN8/SI9vij4wDtg+qycvQhtvDyIPz+fvfyFe4HCPeZIK dyGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=awsRhJvc+hwIehqgXsbiISTrMiM3MRygK+M6GORPxUE=; b=km1VIbVgjzBcoWVGxgnGoIqlhtcto1QoM0+hHfG2PwGbV6BHuq82Z8qFzjzMGW4u3W 0ztXbCjuV/1EuHK5MuQBEyEriZWnw45UTu0ueCXwkeHYbk9x34i+SwdliSrDgz7Hjyno rKwoIgfmTRc0U5DCzH1oeSTuV7tMU7gL1GBLYlxdZcyppUKGsuus+g/C05nNxV7QsNYV WvfqpON2kVLXlK5rM2ISs5z3lF3NEV4FOEegfck8AumTgRuS3GdBjVxcZXlxXTtNVB6P G+8z6yVOPhSWxVhKk66ubgHqGeDXrRS0QI3mYeyDFdAiss8Ig8J6Vq8QtDrAfonUeK8k Os0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Zs+wFtj5; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fi20-20020a056402551400b0045719647582si5454183edb.140.2022.09.26.10.36.43; Mon, 26 Sep 2022 10:37:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Zs+wFtj5; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230455AbiIZRYG (ORCPT + 99 others); Mon, 26 Sep 2022 13:24:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231163AbiIZRXp (ORCPT ); Mon, 26 Sep 2022 13:23:45 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C242C151DCB for ; Mon, 26 Sep 2022 09:38:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 09215B80B40 for ; Mon, 26 Sep 2022 16:38:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A7BAC433D7; Mon, 26 Sep 2022 16:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664210330; bh=R/s/21M6ZNBdHTLFlT1qvJRkgxilLGAnNqbcANIwQao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zs+wFtj5pSXjwk+jycY4FwDwny0WgN8Dovbe3EuU4AZpsbGHr026Hb46Tzyjsv+rp V0XT3Wfi3VAYQRZUmSb+w1loep2yzPblzr5M8olrSo5+5Re6aD+A0YoessOdB1zn9U GsJbV01WGJlfDvTjL/6ddhzHn7YsXqqIXHDoprJVC2zm7WJyR159tr9mmyEv1BfMkT PM/oR7CdCKiVjkv6+pC2TqKCA40a5gc2BbKYz12LqKa4+dxyUG9IghEUpgv14XxUpw sYUhlcIYaElqQCN2B3WjZiMVb2r3UVmyPz4ogLmp1nVScsFmqwVcwGLCiamcAYhLz+ JfkeguYrnA2Bw== From: Jeff Layton To: chuck.lever@oracle.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/4] nfsd: fix comments about spinlock handling with delegations Date: Mon, 26 Sep 2022 12:38:45 -0400 Message-Id: <20220926163847.47558-3-jlayton@kernel.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926163847.47558-1-jlayton@kernel.org> References: <20220926163847.47558-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 273ed890562c..211f1af1cfb3 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4857,14 +4857,14 @@ static void nfsd_break_one_deleg(struct nfs4_delegation *dp) * We're assuming the state code never drops its reference * without first removing the lease. Since we're in this lease * callback (and since the lease code is serialized by the - * i_lock) we know the server hasn't removed the lease yet, and + * flc_lock) we know the server hasn't removed the lease yet, and * we know it's safe to take a reference. */ refcount_inc(&dp->dl_stid.sc_count); nfsd4_run_cb(&dp->dl_recall); } -/* Called from break_lease() with i_lock held. */ +/* Called from break_lease() with flc_lock held. */ static bool nfsd_break_deleg_cb(struct file_lock *fl) { -- 2.37.3