From patchwork Fri Sep 9 18:04:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9324093 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 20AFC60752 for ; Fri, 9 Sep 2016 18:04:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 123A228173 for ; Fri, 9 Sep 2016 18:04:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 061A128342; Fri, 9 Sep 2016 18:04:59 +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=-4.4 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 A26882833F for ; Fri, 9 Sep 2016 18:04:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754322AbcIISE5 (ORCPT ); Fri, 9 Sep 2016 14:04:57 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:36208 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754302AbcIISE4 (ORCPT ); Fri, 9 Sep 2016 14:04:56 -0400 Received: by mail-oi0-f66.google.com with SMTP id s71so8338670oih.3 for ; Fri, 09 Sep 2016 11:04:55 -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=cV8vrwqPuGRDAxkfmk5j53eBDJwDl2RMvSLMWsjpb5Y=; b=wi5Y5gvLGffmI/djmI0xQUyAKx8DujW9flQ9iCEjo3BCUYvFBUgUOoN7qe5MTQlRJj x1+ywJiiM6J6sZRsEUg8SOFpTvPhHN7QWQ18FSjtFPhdZpvfaDLew+dp7bGmtQMG4r+J mR46E13gcnHguggvl5S13oYT8kYCn9EhrS+Q/YCIlWUjAThJvSxwVvw82t75zEEoQwvM bnB+lJ7N0L7+XuKgVfV2RpvGpRdZFYp1/atWqqOf3zFnyVExAKJZ/TZ5emTwuUZqQZqR Ynm1iuh2AlS4wh/yENmwUkPyMJ3n18Pw7oTcD/66BovPsWrhbVY0SJKcUTLVMQRWLv9V szAA== 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=cV8vrwqPuGRDAxkfmk5j53eBDJwDl2RMvSLMWsjpb5Y=; b=DIto+G0D/0eDCyWDBIBmA/eJikZQRRPI/+wrNaVw/07nmWo3yglQo897fRsTqBwW92 +pZoHQshMVQzjWiRz0ytRO2xCQ8PbdVE6bBd8e333NT2Gf8fqdky2KQ2th7AkCQKVd1H ZDAC7WvOKni/4r0uWPCk8T7M769BgqK3hPnTT0WdPaPuqXZRTdO2rJ7QPsgOHQ4/ULoa pEtX1/julHjHI1EhLfgqves+vPwE/Y8e+jivBE2ochrm5BYMKqTm/ve9tO7+wsUlY9Jz K5mxA6QvF1IKsK2ZSRsNOogC2uvZrhaLLEfoppMrH3x1U7r3AuNXqjnJFJ/aB5PISILe uU1w== X-Gm-Message-State: AE9vXwO29mHrX3P6S5xchDxOY7Jl/u9FCrmjnI0cbc9fq1AQgoHZV5+Wk+0oWxpz7hFrJA== X-Received: by 10.157.34.48 with SMTP id o45mr6595360ota.37.1473444294874; Fri, 09 Sep 2016 11:04:54 -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 r200sm1925797itc.13.2016.09.09.11.04.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2016 11:04:54 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Cc: Oleg Drokin Subject: [PATCH v3 12/12] NFSv4.1: Ensure we call FREE_STATEID if needed on close/delegreturn/locku Date: Fri, 9 Sep 2016 14:04:13 -0400 Message-Id: <1473444253-12433-13-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473444253-12433-12-git-send-email-trond.myklebust@primarydata.com> References: <1473444253-12433-1-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-2-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-3-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-4-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-5-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-6-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-7-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-8-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-9-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-10-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-11-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-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 | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 5442e0e1de14..ffb3218a4a00 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -328,6 +328,18 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent kunmap_atomic(start); } +static void nfs4_free_revoked_stateid(struct nfs_server *server, + const nfs4_stateid *stateid, + struct rpc_cred *cred) +{ + const struct nfs4_minor_version_ops *ops = server->nfs_client->cl_mvops; + nfs4_stateid tmp; + + nfs4_stateid_copy(&tmp, stateid); + tmp.type = NFS4_REVOKED_STATEID_TYPE; + ops->test_and_free_expired(server, &tmp, cred); +} + static long nfs4_update_delay(long *timeout) { long ret; @@ -2983,9 +2995,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 +5492,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 +5763,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);