Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2697287pxb; Tue, 9 Mar 2021 08:43:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJynnsYlyztyXGlq51gbNyYKax2fyMKbgSm5XdBNODqIjWwKodJncVOnRBuOF5ovJ/3mqYDS X-Received: by 2002:a17:906:6c93:: with SMTP id s19mr20964370ejr.151.1615308216903; Tue, 09 Mar 2021 08:43:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615308216; cv=none; d=google.com; s=arc-20160816; b=jKWI6GVBIYa7zoSfTPbo64Ik8ZGDmVU+0lDXicQ/HMyp2BHCzkFthGWw5w1hR23/2x QyoAo053qnIhxkKXsBu3fIn+rgluz3NIaquEwvL1oIEp8mgGPoRRP4H++pmyJcpEhwvr z0x7SF6CL3h2J/NnaVrT+7fPNSb2+6NWuI0Dm+ED/X7bMJKGX5POG2p7bZP8lZ2gd/YN yKXeiywjxfgX9X5pnpTHN48In6qHSzQW2aUxZGhjX4N1WYtjrGw4FRRT6zKhntsCo53n GGtmPDi13pLOTxegJtO7AMXDa5U6s93YUcK4rPYxhw5Vwc+1bv2inqtqsJLdacjTTjA1 RtIQ== 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=qaP35OolCuh0JJuDAfWuBYmqQlAoAW6aR7EacpzqKaA=; b=AfbRhh8RVOAh6SC+TQyV8ebzLghu6oz2HJlc7F7xlxxUi+yreBVADX/rkJZ2sb0wP/ 9n8YWVqG2OSE/8Yyj3LmT/Bx+BHicZNQP4m3ythx7/dKK/wlpJqpzD+ot6oDwjhK2bMY lO2Tl7gm3DucWxgbJlmanEA1iQ+ZoDfPz6tLVHQihnmIqzfORRC1EffalWP2rxanu5VI 2G8yqTaciCWFLhKajSpjxHXdTp5FHtHkbC5C5zO49QDCoVA/XNN5cBHWJHW5ZjiVMXkg 6z+maYm7lEt8oYyULoCyZ+ep886T36E7zGOd01JMj4ZNfccK1Kp/hTxqNLPblDsI634L gPAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=kciBaUb6; 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 go37si9726922ejc.406.2021.03.09.08.43.13; Tue, 09 Mar 2021 08:43:36 -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=kciBaUb6; 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 S230328AbhCIQmm (ORCPT + 99 others); Tue, 9 Mar 2021 11:42:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230489AbhCIQmc (ORCPT ); Tue, 9 Mar 2021 11:42:32 -0500 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05F3CC06174A for ; Tue, 9 Mar 2021 08:42:32 -0800 (PST) Received: by mail-io1-xd2e.google.com with SMTP id n132so14638223iod.0 for ; Tue, 09 Mar 2021 08:42:31 -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=qaP35OolCuh0JJuDAfWuBYmqQlAoAW6aR7EacpzqKaA=; b=kciBaUb60gt6Eogdd9b3P0CQiLWafkrvUDl85pIgLmvPi6JZzcnBiaNnK0iEdhDSdp Myw+WHb3tXbkImjjDSRzVnuxuBdUNep5/DDU8K4H53bc8eoKU/71E47qMXVyd3wSiy+Y rL9CezCBIWqgepJKmBMhvJlMrmaMTUEpgjjp9ADTUOHXixjgsMYKrrSbDKhznxDR8S/R 5s245PrD0tebgcpxvkf+rXwwhgIfV4r3bd5+ouFioGQ50okXvEWhMb5W4cQFOoMkbyj1 +EePjPYkIV+jGWCwY13tLlbAIaB0DzruROUpMspgyHRL9QY6m0LFND2Tgdoumc4GtitN 41kg== 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=qaP35OolCuh0JJuDAfWuBYmqQlAoAW6aR7EacpzqKaA=; b=lr5uCj9ZC7b40dyLe8uWlinquzpWHW96s2IoryYhkMC32LRQGBKluOuwzgjcR3/Qcq 5exlXi5koqV9PwWd+6mBeJmw40e5SWCrwVnAuqtaf4QCwm3+j9EfGkIdPCF5nn0LsCpP 7jaq8DltCNlP5yMSajhh51YPwWeQqte8wCcVLFUIOF2X9t2+kPyd6Ie/kFIV9v2hNlsv v2Ig8Kba14m4NenLZsCGDoeZmELBWoUuv9/KoPM5m0xz8auzUco01olFDNyUQLsbN5lO wVoYwPxhtkRErRf7oJL+rBSFU966tvZqDDJBplXH/yV97naaJHqXke5zjpNSDfNEZW7w sOeg== X-Gm-Message-State: AOAM531FaJ+FQR/lOtCkxeJLXfJk1V6hnGRyxiOMdR4E5gNaTEfD2g91 LcGGqQIR+TWvZ7hK6nwBi88= X-Received: by 2002:a6b:610d:: with SMTP id v13mr23517997iob.132.1615308151506; Tue, 09 Mar 2021 08:42:31 -0800 (PST) Received: from kolga-mac-1.lan (50-124-244-195.alma.mi.frontiernet.net. [50.124.244.195]) by smtp.gmail.com with ESMTPSA id d3sm8090314ilo.32.2021.03.09.08.42.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Mar 2021 08:42:31 -0800 (PST) From: Olga Kornievskaia To: bfields@redhat.com, chuck.lever@oracle.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 1/1] NFSD: fix error handling in NFSv4.0 callbacks Date: Tue, 9 Mar 2021 11:42:29 -0500 Message-Id: <20210309164229.60153-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 When the server tries to do a callback and a client fails it due to authentication problems, we need the server to set callback down flag in 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