Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp4178081rwi; Wed, 12 Oct 2022 11:45:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5FDxFv3V2Y+UvCwdDlZXhmMz6Jj7s9SDvePtTW+2856qrJGY27iqrBWAvZLyzoz3tEU+MO X-Received: by 2002:a17:906:974c:b0:784:d96c:b4fa with SMTP id o12-20020a170906974c00b00784d96cb4famr23507712ejy.391.1665600313003; Wed, 12 Oct 2022 11:45:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665600312; cv=none; d=google.com; s=arc-20160816; b=r/+36HYqU5ulI5na6oOO9ZYNyW7P9W0XNrnIbikZIDk/p7kl57zQQvTN1AQs084qki vF5U4FZI7yv5WEchXy0FYg4BHtcBvq0+7+4MvBiHsxxd1Qkf+uSzDK+UiVkp1mdRVJCk 2Se5mKQkafTOnUpZ9LqEo/KJW+qFnBZ4qdPBcLlknRMsDZ2mTi930h9WQY/sQuoOMjUM 5vL/yZsc7xiYo7+8Co2mf0lMkN8zVfkHFFbO668aQFrPLe6DPAh5mfr+MAARFl4u9K3c RKq1QQEm/RC9MtOR5ZYLY3Mc619xPxIf1CL9GipKC4xU0VUCmnwS8EQheqmf0v/hiL78 IvUw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=IyUTBLvUB5eDmn/vwefRDiYiItI32UOpWoWVtsvud2g=; b=03tJJEVJ87rsMGypwecxFMXYW6sd7ruNQMJ9lYJ1veB8Rha6Mxg348CyMavquseVLb xurvY952rkPHpKIWVY69juG1oj00PyzH9qvsg/ZKtvY+ySuOKUa5UAikaWDNaFoFxmfb CB0uPaweaY9z1Ca798u/R71G3FZQ5imbDY5gV/SYKDpDsYEUUxKB2FCMG935Q6JnfCbB UDwwjYhsrbkSoAjJE/9WPNDduW//DHTbYJjGbeld3w73Te7csXN2Xd04RsQHmgkQILSz pcbjsRUuqPM+W3blD3kOxr3+2yCpcwnktun0fRdUbFnmHw/sFTtPEMN9VHiExbclxuyP p9EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=DvNaVP0I; 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 o23-20020a50fd97000000b00459060fcde3si15598755edt.202.2022.10.12.11.43.55; Wed, 12 Oct 2022 11:45:12 -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=DvNaVP0I; 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 S229834AbiJLSn0 (ORCPT + 99 others); Wed, 12 Oct 2022 14:43:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229695AbiJLSnZ (ORCPT ); Wed, 12 Oct 2022 14:43:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE80CA3453 for ; Wed, 12 Oct 2022 11:43:23 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 4F6FC614E4 for ; Wed, 12 Oct 2022 18:43:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B9C1C433D6; Wed, 12 Oct 2022 18:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665600202; bh=R1ZAzJFd0tuFpVdwLyWfmNIKi8rFwxbZ38fD/QH2eyo=; h=From:To:Cc:Subject:Date:From; b=DvNaVP0Ipt1opmPu/0+26MEmSo4LrqJq6Zg9mEvqKcRUGoeYso+mY3t1V7QN8lD4e k4RAEcCNNNhS27ge7B5vNVTrkQcx3td/IDXKc9RE7xNhTZ+0JFeRFqOYb1fhTHAmKJ yPrnlm5VGdFjhlPWzMFRne4CjiIVcTPErd1VM3YpxX8EChcqS3Sd4Cigp+bNRxr8BM h8qT99k6WG2zJxLR97YojE78JOSWuqcg4yIFgFBT3elW/3fiGBmWNtSHn/NsX9NHci mVVap7batMDSImlVDrM5ZCLiKPaV/apXj5HOaG1DoxmKhYeSZZdR6uFPk+P4NCZKu7 yiPHvt6/9V13Q== From: jlayton@kernel.org To: chuck.lever@oracle.com Cc: linux-nfs@vger.kernel.org, Jeff Layton Subject: [PATCH] nfsd: ensure we always call fh_verify_error tracepoint Date: Wed, 12 Oct 2022 14:42:54 -0400 Message-Id: <20221012184254.30539-1-jlayton@kernel.org> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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 From: Jeff Layton This is a conditional tracepoint. Call it every time, not just when nfs_permission fails. Signed-off-by: Jeff Layton --- fs/nfsd/nfsfh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 9c1f697ffc72..43bb34f1458e 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -392,8 +392,8 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access) skip_pseudoflavor_check: /* Finally, check access permissions. */ error = nfsd_permission(rqstp, exp, dentry, access); - trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error); out: + trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error); if (error == nfserr_stale) nfsd_stats_fh_stale_inc(exp); return error; -- 2.37.3