Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2772310pxb; Tue, 9 Mar 2021 10:24:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxuC3MqujiVsj/QMHOUL/HngW3mAksvMoIRn6VKMlJ2gLzAuI/o2HCx6yH7q7EVw712inPp X-Received: by 2002:aa7:d4ca:: with SMTP id t10mr5634933edr.388.1615314297881; Tue, 09 Mar 2021 10:24:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615314297; cv=none; d=google.com; s=arc-20160816; b=HlDvSy303jHm0Qs09WEEEb2iSkriju6ITTLA2JHvfXFhnY/bM0+L5xDx+02G/l6C6Z vCDQg6Xnhgxp1LQ/ZPs3odJ7hrafvg41WMAHAUaga38wNKniYUDDHJxKn8aQitoCvugh NsPfuqRbWhUkFbZ1WL+CLyCXal2Otsk4Wx02NqMAly1hlF69wdYrLrpQl/sALQTwmqq2 TiPILCVLne4L/C+IZlWTY1RrvA+825lM6rojtMU5zB716duWaQI8LLX4CDIhjzZNxqz6 BlKUJYzdG5h6VEsPvkkUMyN65KmaxhfqQudV2QLFFQPE281jfKs4f6+QAxWwUSgklo0a 0LdA== 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=PMvBwUr43sXk816z08e0HPkkGATwk/3iFEDn175IbAs=; b=qbn2FeR1cFwduS5cSCvhAlFNFKP6HWXy1Qt5JPYgpz+hYjZEEtCJJaFoZEncG/sFh5 rp24B5j0fEV6GCyMyX2MlWejYVMkChKL+3wdvTU/htnC3uxnp5L4+wjvhnVFu8keHh/Q qNY8zzD9CwTeib7NLaeFfRtrUi4ECV2AnAzx/MsICZ4FD04WZ+VrcTwIJEQIvDf3/Twb R2lXdGyEaWUFKGMiWgFQwihnA78jTGjFThv9enGrhLJZ3k3LhVRewLT0Q3uR1EGHHioI H6557zmKAfgArm90KlGRodWlP5n4NWVCh3Tas9j4JdTfe5gTnTPBw5ghwtDHaMftMSGm wzVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Qv4G8rOr; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p14si10114775edq.556.2021.03.09.10.24.35; Tue, 09 Mar 2021 10:24:57 -0800 (PST) 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; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Qv4G8rOr; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230319AbhCISYB (ORCPT + 99 others); Tue, 9 Mar 2021 13:24:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230433AbhCISXl (ORCPT ); Tue, 9 Mar 2021 13:23:41 -0500 Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 379EEC06174A for ; Tue, 9 Mar 2021 10:23:41 -0800 (PST) Received: by mail-qt1-x830.google.com with SMTP id o1so10917365qta.13 for ; Tue, 09 Mar 2021 10:23:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PMvBwUr43sXk816z08e0HPkkGATwk/3iFEDn175IbAs=; b=Qv4G8rOrQe7HcLDBuePZyJ2tnRNB24pCtNEsXWy8E3bf3IYdN64IB3TwrAL5fZ2VNg u9qDrfqfuQ1lmA+kcrIGyikS9+oiw5QNqNgyCJFl8W4OgAVtgIgkuhDpLSEuEh+3zxah Kns6OZwp+0vLU1i4os+Uxc+eUUk1+dZf6iBzDYEmUyGJrzHo+JYiIixVnlkAzB/wTkTe /7QtvY3zllZOdW0SudXAladaKudzpx9Gifouz/wru5U6thBYySbJZt+FWvu3aaygRf6B Y187t5lGQPVymCgAcLfUfmnE0nJlel6BvDwOyYq3EouHnBvzfAngbfjp1BoOzIPZcQpx K2Bw== 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:mime-version :content-transfer-encoding; bh=PMvBwUr43sXk816z08e0HPkkGATwk/3iFEDn175IbAs=; b=n3ZgrH57C4JmervgcZTSvYkML4aEy3ccXnlIo9IGH7F4nB55Atz2mR4/R+5p/R/f/Y ftuj35NmztOveN6L/MHL77swzFVrPG+zBqlVfEmg0SMR1g0YsgMw3ynMJMIi9I1PzI+l MDBBwJaYIH7Rhv/3yV1AO8tH6a0paRAFXfU1dHfsvQt6+96Ol9/ogZCMgdcNmI0wTKeZ pIbvfBAobGYlehkYzfzkcn7JOzjYotFHO66mRsIK6olxczSrPy5koOmxbA0zeg2WSn6c yBEOx7U1QFjrFleJLexxYWMgt6lViuE0eCW8zzdZ9DMoiiJYVGVkUNi6Pmmyk/6dwFbc wBrA== X-Gm-Message-State: AOAM533jhwNhE/hanhf/uMGLy1cfbG/lb56lyA5vwB56USJ+yTCjF4si HUlP4Oh+W0Mi0kBduPJ5lBGnguxex70= X-Received: by 2002:ac8:5c0a:: with SMTP id i10mr25416327qti.356.1615314220261; Tue, 09 Mar 2021 10:23:40 -0800 (PST) Received: from kolga-mac-1.vpn.netapp.com (nat-216-240-30-11.netapp.com. [216.240.30.11]) by smtp.gmail.com with ESMTPSA id l5sm10058032qtj.21.2021.03.09.10.23.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Mar 2021 10:23:39 -0800 (PST) From: Olga Kornievskaia To: bfields@redhat.com, chuck.lever@oracle.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 1/1] NFSD: fix error handling in NFSv4.0 callbacks Date: Tue, 9 Mar 2021 13:23:37 -0500 Message-Id: <20210309182337.62308-1-olga.kornievskaia@gmail.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org If the server's attempts at sending a callback request fails either due to connection or authentication issues, the server needs to set NFS4ERR_CB_PATH_DOWN in response to RENEW so that client can recover. Suggested-by: Bruce Fields Signed-off-by: Olga Kornievskaia --- fs/nfsd/nfs4callback.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 052be5bf9ef5..f436d2ca5223 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -1186,11 +1186,8 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata) rpc_restart_call_prepare(task); return; case 1: - switch (task->tk_status) { - case -EIO: - case -ETIMEDOUT: + if (task->tk_status) nfsd4_mark_cb_down(clp, task->tk_status); - } break; default: BUG(); -- 2.27.0