From patchwork Thu Sep 15 16:45:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9334287 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 8031A601C2 for ; Thu, 15 Sep 2016 16:46:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7519929A79 for ; Thu, 15 Sep 2016 16:46:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69AE629A7B; Thu, 15 Sep 2016 16:46:23 +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=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 0450E29A7D for ; Thu, 15 Sep 2016 16:46:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754063AbcIOQqV (ORCPT ); Thu, 15 Sep 2016 12:46:21 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:35998 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753998AbcIOQqT (ORCPT ); Thu, 15 Sep 2016 12:46:19 -0400 Received: by mail-it0-f66.google.com with SMTP id n143so5023489ita.3 for ; Thu, 15 Sep 2016 09:46:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=1nVAQVcPMa6FuwGTSHq8b5vPJk95zu9Ym8jyIz9lIlY=; b=w3UiYPXBzBYd3npFFXHcdVGhkF784RbH/1yD8vdbsFx6MRPdi8d0oE5SsINuV9Gwft e+smF44HdmambLoasIL+yEyFHkAFekoSDltpqHiHOwQSjWxtkpv9//I/g7DSyMvrS6+r BQFrTRfgJVu2vRGqU+iSlTKbtG2/RubHJgDoFIm/xzckUS0iPgWNG3kFBd07CrKDhn1f MYCCtSofhpFwh7uZlIqf8pI93onlw+KsHvYtUzAFEoWEWe5P1AvEvd0kpLGzwTrjoksS 4ug5riBWsqbT4CxVODfmKDxLcaRe/pQZIpbzJdtM2q3yMOTKnyEPhc/XSMUOGsd8dzkH 85jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=1nVAQVcPMa6FuwGTSHq8b5vPJk95zu9Ym8jyIz9lIlY=; b=AEAOGZl4RJDCdRj/2gOfs2tKl33HWtK1HIn4YAyB6L5L7yXQQvy0lkTJ17IJy4Lre9 k3/HMByP7ipI0VbhxudbBbXWNpQMBCRrfnXaPTUd8YLtAZzmeF2ypplDJLgg8+FUoP/B WqCSytA5+LYjs/m+gAMtR3Y0cnK1CpOF0D8ol4FgtCRpuUy5LVBN0dee0Ll6w4Edirya B+/kqGVz9XoWCFzOUQC1OTP9zHo+PwkWjFrMxsCBnfJqi3FnIYNuMll24LpPF4TWIoPw Ir+85z97SN00Xfv+2oFASlgpr8V4dVBg2Mmj00mU9VDAWJHdtglqbT6JunI0T1/QaifD WRgw== X-Gm-Message-State: AE9vXwMwq3rV1QYSCwfhE8ok08CdTzue9MlY/BuDBGsAxv74vmgKCLzciIXhScWK8R6pHg== X-Received: by 10.107.17.227 with SMTP id 96mr18105113ior.15.1473957978685; Thu, 15 Sep 2016 09:46:18 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id y132sm1248687itc.20.2016.09.15.09.46.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Sep 2016 09:46:18 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v4 12/20] NFSv4.1: Ensure we call FREE_STATEID if needed on close/delegreturn/locku Date: Thu, 15 Sep 2016 12:45:52 -0400 Message-Id: <1473957960-10001-13-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473957960-10001-12-git-send-email-trond.myklebust@primarydata.com> References: <1473957960-10001-1-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-2-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-3-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-4-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-5-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-6-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-7-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-8-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-9-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-10-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-11-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-12-git-send-email-trond.myklebust@primarydata.com> 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 a server returns NFS4ERR_ADMIN_REVOKED, NFS4ERR_DELEG_REVOKED or NFS4ERR_EXPIRED on a call to close, open_downgrade, delegreturn, or locku, we should call FREE_STATEID before attempting to recover. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index a53caeb73f75..f79d4f55d83f 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -328,6 +328,33 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent kunmap_atomic(start); } +static void nfs4_test_and_free_stateid(struct nfs_server *server, + nfs4_stateid *stateid, + struct rpc_cred *cred) +{ + const struct nfs4_minor_version_ops *ops = server->nfs_client->cl_mvops; + + ops->test_and_free_expired(server, stateid, cred); +} + +static void __nfs4_free_revoked_stateid(struct nfs_server *server, + nfs4_stateid *stateid, + struct rpc_cred *cred) +{ + stateid->type = NFS4_REVOKED_STATEID_TYPE; + nfs4_test_and_free_stateid(server, stateid, cred); +} + +static void nfs4_free_revoked_stateid(struct nfs_server *server, + const nfs4_stateid *stateid, + struct rpc_cred *cred) +{ + nfs4_stateid tmp; + + nfs4_stateid_copy(&tmp, stateid); + __nfs4_free_revoked_stateid(server, &tmp, cred); +} + static long nfs4_update_delay(long *timeout) { long ret; @@ -2983,9 +3010,12 @@ static void nfs4_close_done(struct rpc_task *task, void *data) break; case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_STALE_STATEID: + case -NFS4ERR_EXPIRED: + nfs4_free_revoked_stateid(server, + &calldata->arg.stateid, + task->tk_msg.rpc_cred); case -NFS4ERR_OLD_STATEID: case -NFS4ERR_BAD_STATEID: - case -NFS4ERR_EXPIRED: if (!nfs4_stateid_match(&calldata->arg.stateid, &state->open_stateid)) { rpc_restart_call_prepare(task); @@ -5477,10 +5507,13 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) renew_lease(data->res.server, data->timestamp); case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_DELEG_REVOKED: + case -NFS4ERR_EXPIRED: + nfs4_free_revoked_stateid(data->res.server, + data->args.stateid, + task->tk_msg.rpc_cred); case -NFS4ERR_BAD_STATEID: case -NFS4ERR_OLD_STATEID: case -NFS4ERR_STALE_STATEID: - case -NFS4ERR_EXPIRED: task->tk_status = 0; if (data->roc) pnfs_roc_set_barrier(data->inode, data->roc_barrier); @@ -5745,10 +5778,14 @@ static void nfs4_locku_done(struct rpc_task *task, void *data) if (nfs4_update_lock_stateid(calldata->lsp, &calldata->res.stateid)) break; + case -NFS4ERR_ADMIN_REVOKED: + case -NFS4ERR_EXPIRED: + nfs4_free_revoked_stateid(calldata->server, + &calldata->arg.stateid, + task->tk_msg.rpc_cred); case -NFS4ERR_BAD_STATEID: case -NFS4ERR_OLD_STATEID: case -NFS4ERR_STALE_STATEID: - case -NFS4ERR_EXPIRED: if (!nfs4_stateid_match(&calldata->arg.stateid, &calldata->lsp->ls_stateid)) rpc_restart_call_prepare(task);