Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4628206pxj; Wed, 12 May 2021 09:33:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxi9mQwgm1V0+oo+9wYHoR2QBUXci8JIeK6TwlbExyuPXAAhlXNPhxFLdk4cnDq8js6nlkW X-Received: by 2002:a05:6402:438d:: with SMTP id o13mr25037764edc.324.1620837227557; Wed, 12 May 2021 09:33:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620837227; cv=none; d=google.com; s=arc-20160816; b=jXX++iBXrS9Sfuc2l+TGJhQUfAsVadSnuPKKIMmbNDFSMUMbihciYt90b1/KiWXTdk kNWeCC6bNKTq529hGzYSbl8PjVUCWBU46Zl1/tjfrpyZ1kiNnwwKUG8z7carlUGDkuKd C0TgsFepqrl44ZbwiEoVtw3jjbzXCgjI1lDkLoCNLJhvdN6WlareaOyV4fAmpaWctU9F 87ydV+2daaiifEpNUSsf1byQp0THmMDbWs7UJeIiVzyeiBFVhHX7Po6UTj6wnsWcib4H AEfBgY/ia7A9lm8sv/U1vEpeN4nISb6iZ24vG1GJ83fIERa0c/jyBKAufLlTACi209hI 3buw== 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 :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject; bh=olcEe/f/Lt27+qm5UelwLkx4B6H8MH5HoBRCklzlMLc=; b=SOQuXA1voDQnVAEc9fXM/wgpcgqp5UMjHF/xRVKqH/jjnvCEBVXCh/sDgjrfQaMYnx r5166cGw68pYVCGj/MYVo7oWNYNl0pDr+Gg4mJhQ/uTLp1kHCIhaH0RIsZOfx/YilA83 mYusffp4g4wugscy/WADmmv6/+A0sFwqHePX8xlvx2lz3JmxmyuTxFj523FrMQ63XNsN tro7hYmlBZCCMfoN+v51ETbEPvtRbaHs0boz+UyE8YsnDpiiabmAQc+d3I1gsTsUi9St kT21xr4tRApbjp7jQrQlmpZFvMIEx1oUJJlr12neO9kEgmltsXsmfKm96KcbV9uGoqV6 gVQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l20si84189ejx.738.2021.05.12.09.33.23; Wed, 12 May 2021 09:33:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239156AbhELQdK (ORCPT + 99 others); Wed, 12 May 2021 12:33:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:34630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239212AbhELQHg (ORCPT ); Wed, 12 May 2021 12:07:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8E9AC61D1E; Wed, 12 May 2021 15:36:54 +0000 (UTC) Subject: [PATCH v2 18/25] NFSD: Remove spurious cb_setup_err tracepoint From: Chuck Lever To: linux-nfs@vger.kernel.org Cc: dwysocha@redhat.com, bfields@fieldses.org, rostedt@goodmis.org Date: Wed, 12 May 2021 11:36:53 -0400 Message-ID: <162083381366.3108.6618271807599739861.stgit@klimt.1015granger.net> In-Reply-To: <162083366966.3108.12581818416105328952.stgit@klimt.1015granger.net> References: <162083366966.3108.12581818416105328952.stgit@klimt.1015granger.net> User-Agent: StGit/1.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org This path is not really an error path, so the tracepoint I added there is just noise. Signed-off-by: Chuck Lever --- fs/nfsd/nfs4callback.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index ab1836381e22..15ba16c54793 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -915,10 +915,8 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c args.authflavor = clp->cl_cred.cr_flavor; clp->cl_cb_ident = conn->cb_ident; } else { - if (!conn->cb_xprt) { - trace_nfsd_cb_setup_err(clp, -EINVAL); + if (!conn->cb_xprt) return -EINVAL; - } clp->cl_cb_conn.cb_xprt = conn->cb_xprt; clp->cl_cb_session = ses; args.bc_xprt = conn->cb_xprt;