From patchwork Fri Jun 8 20:30:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10455217 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E238A60159 for ; Fri, 8 Jun 2018 20:31:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E0CC3295F7 for ; Fri, 8 Jun 2018 20:31:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF743296B0; Fri, 8 Jun 2018 20:31:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70110295F7 for ; Fri, 8 Jun 2018 20:31:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752864AbeFHUbP (ORCPT ); Fri, 8 Jun 2018 16:31:15 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:38280 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752756AbeFHUbO (ORCPT ); Fri, 8 Jun 2018 16:31:14 -0400 Received: by mail-io0-f193.google.com with SMTP id l19-v6so17313431ioj.5 for ; Fri, 08 Jun 2018 13:31:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=9JRN0/XdoXpQKWTf0gsTUwAYgrbXKiYEuMTV8FGzvxo=; b=MbJFpkxIQxxgpHHtUeGVvsao1G+x2plEaclL4Cq/vhIp+bvSco8svSYBIGNLGlgTkN LTcvh41kAT6r8mDyLTMro0IK99oKFneNGogzz3stfvrfi6KuqyHexAsiR84YLg1xo3q6 6WQue9lkBTmfluscIzpSgVzQeU43eT4A3egz22MJnGxAakblOqTJj0f6ICM9pjQNCFpM Wb79wtUvfoqWTd06hKtq+Kw20R3upo2ym4k3k7BJKHRUiAVhHXlg2c0pg8+5L63gja5R HEtKy3gUO1X+r86xP2RW8JnVMUfl6g+L3gnE2Dgvs71exB0mFUM/Kq6czIzizCQmGpBM kAHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=9JRN0/XdoXpQKWTf0gsTUwAYgrbXKiYEuMTV8FGzvxo=; b=bf3XP6T+WueNhxr7Gz67M/+Oi7ILjNmou/HWzYLpVukCKFPcfsxxj1q9qynPySfj1W YsGSQmZ61ulEMukUquCnMC0G4duD1f4Nqf0GwxaALtLBYjPjsylLHHhlrYKHm6yffFYP z2FhpzbNsAXrBEoK8uF1Icj+P3xzvt27PIkdiqYC0Le2tn0hd2iSffK+oD6/Jz16DKJb opbpfg9tiTYHG3kz5TveWd60yunriw/m6jJ3jerZsAIg7Ra6tOlPszUmeqhr4WbeESPu PURLqqBm5c9r7Sri+jrOCjHKoh5Nh6xk+wUJi2K6RbDRF+Us0K9IwNHroZJQ9tzma7wx zJ8g== X-Gm-Message-State: APt69E2NPQ0t/M5P91WVTaInhaOSC1MlCIYgCLqYNQ9YtJXNfsp7DuWl FgiXHevo/c++eaVNyXT06o3QfTI= X-Google-Smtp-Source: ADUXVKIwMfLper2e12ydV4UMP+946PnxwGG6DiEfbxe5AG+ntR832T6zIf2GrRaxI5FPlQexqe1drg== X-Received: by 2002:a6b:150:: with SMTP id 77-v6mr6168443iob.138.1528489873855; Fri, 08 Jun 2018 13:31:13 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-36-175-81.alma.mi.frontiernet.net. [50.36.175.81]) by smtp.gmail.com with ESMTPSA id q11-v6sm1845166ita.15.2018.06.08.13.31.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 13:31:13 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2 1/2] NFSv4: Return NFS4ERR_DELAY when a delegation recall fails due to igrab() Date: Fri, 8 Jun 2018 16:30:45 -0400 Message-Id: <20180608203046.32370-1-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the attempt to recall the delegation fails because the inode is in the process of being evicted from cache, then use NFS4ERR_DELAY to ask the server to retry later. Signed-off-by: Trond Myklebust --- fs/nfs/callback_proc.c | 8 ++++++-- fs/nfs/delegation.c | 16 +++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index d561161b7c3e..eacd09dcdad1 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -40,7 +40,9 @@ __be32 nfs4_callback_getattr(void *argp, void *resp, rpc_peeraddr2str(cps->clp->cl_rpcclient, RPC_DISPLAY_ADDR)); inode = nfs_delegation_find_inode(cps->clp, &args->fh); - if (inode == NULL) { + if (IS_ERR(inode)) { + if (inode == ERR_PTR(-EAGAIN)) + res->status = htonl(NFS4ERR_DELAY); trace_nfs4_cb_getattr(cps->clp, &args->fh, NULL, -ntohl(res->status)); goto out; @@ -86,7 +88,9 @@ __be32 nfs4_callback_recall(void *argp, void *resp, res = htonl(NFS4ERR_BADHANDLE); inode = nfs_delegation_find_inode(cps->clp, &args->fh); - if (inode == NULL) { + if (IS_ERR(inode)) { + if (inode == ERR_PTR(-EAGAIN)) + res = htonl(NFS4ERR_DELAY); trace_nfs4_cb_recall(cps->clp, &args->fh, NULL, &args->stateid, -ntohl(res)); goto out; diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 91c3737d69df..4b845d2fdb81 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -849,19 +849,21 @@ nfs_delegation_find_inode_server(struct nfs_server *server, const struct nfs_fh *fhandle) { struct nfs_delegation *delegation; - struct inode *res = NULL; + struct inode *res; list_for_each_entry_rcu(delegation, &server->delegations, super_list) { spin_lock(&delegation->lock); if (delegation->inode != NULL && nfs_compare_fh(fhandle, &NFS_I(delegation->inode)->fh) == 0) { res = igrab(delegation->inode); + if (res == NULL) + res = ERR_PTR(-EAGAIN); } spin_unlock(&delegation->lock); if (res != NULL) - break; + return res; } - return res; + return ERR_PTR(-ENOENT); } /** @@ -876,16 +878,16 @@ struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs_fh *fhandle) { struct nfs_server *server; - struct inode *res = NULL; + struct inode *res; rcu_read_lock(); list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link) { res = nfs_delegation_find_inode_server(server, fhandle); - if (res != NULL) - break; + if (res != ERR_PTR(-ENOENT)) + return res; } rcu_read_unlock(); - return res; + return ERR_PTR(-ENOENT); } static void nfs_delegation_mark_reclaim_server(struct nfs_server *server)