From patchwork Sat Sep 17 05:13:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336991 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 307556077F for ; Sat, 17 Sep 2016 05:13:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23CD929FAD for ; Sat, 17 Sep 2016 05:13:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 18DD329FCB; Sat, 17 Sep 2016 05:13: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=-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 B846829FAD for ; Sat, 17 Sep 2016 05:13:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757473AbcIQFN5 (ORCPT ); Sat, 17 Sep 2016 01:13:57 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:35811 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756486AbcIQFNy (ORCPT ); Sat, 17 Sep 2016 01:13:54 -0400 Received: by mail-it0-f68.google.com with SMTP id e20so1839521itc.2 for ; Fri, 16 Sep 2016 22:13:54 -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=IqiVeobeXkbIl91hDKxBoenAA1VQObtD63WLlKCOUM0=; b=Q5bt8NjZolEdFojC1upQjUVEnWPeMJqHYoX0Bj7dEalaYlVwONFx2rWlBs8j3xSjo7 68j626ozZt0zTZ62v1iLmvBxeXh2q/mufhHmRe/0lK3kienrbY+bokn1el3/r/o99gH6 lvNVS4h5cGszZnyXQLeVfUsKPgarjVMEyfo2N2o84BMZ2ZXzyuT0gkhn8ZkMojHXcdzd uUZIdizC8lakRvnaZYRNRcdzJ9q+9JwAQB7hAvT7EjiT33S9oHwhBGy+kzyYAAyASBTH 403sx3KkXm46aTpxLm7roZlnoC2m7jrpN7GpiVHyxlxJP8ehd8RN0z1kfxAclLYyRr6m 5t0w== 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=IqiVeobeXkbIl91hDKxBoenAA1VQObtD63WLlKCOUM0=; b=SdXEIH/dLD2cH5SKYw85dWaISZwSlAj65tC9pRu8JBlQCOQiXwZxCQj+xvK/jbZwP8 qbUw2d1ZQYj+ztzs7JFf4OwsYNbYKMarN0rIXpdO1WOZsqs+S2fEYDUmA7nUDA5hXDNG EelwqGJLQTbLVNKDi32k+2rUbBZGQOi6SRwrRrIgq7i9qgk/r2mTsMVJj1PFIYj//qR3 x1YKHHqlzQ7jhcURwcIpPVtDD1isjvf2rRwdI0roWndKIpsZx3OpCPlOm/U+WTtCfZjn Lu7WIQyr7i5UU7n0Ht6NjohmLYu2+3ldXvB6o7HiSa0GKDdkvFrEz90cBjXrPdjxvrZK IJ4A== X-Gm-Message-State: AE9vXwOUnIcJTDMJd8q2nXiwS8eHRPY8wmWQv4jYCvZSs2GTVPI55IMn0rD3SFyXyYb2sw== X-Received: by 10.36.118.193 with SMTP id z184mr968827itb.26.1474089233893; Fri, 16 Sep 2016 22:13:53 -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 d15sm4993916ioj.19.2016.09.16.22.13.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:53 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 19/25] NFSv4.1: nfs4_layoutget_handle_exception handle revoked state Date: Sat, 17 Sep 2016 01:13:27 -0400 Message-Id: <1474089213-104014-20-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-19-git-send-email-trond.myklebust@primarydata.com> References: <1474089213-104014-1-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-2-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-3-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-4-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-5-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-6-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-7-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-8-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-9-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-10-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-11-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-12-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-13-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-14-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-15-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-16-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-17-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-18-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-19-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 Handle revoked open/lock/delegation stateids when LAYOUTGET tells us the state was revoked. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 0c050e932c7e..e2ab6f665dba 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -8069,6 +8069,8 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, case -NFS4ERR_RECALLCONFLICT: status = -ERECALLCONFLICT; break; + case -NFS4ERR_DELEG_REVOKED: + case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_EXPIRED: case -NFS4ERR_BAD_STATEID: exception->timeout = 0; @@ -8080,6 +8082,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, &lgp->args.ctx->state->stateid)) { spin_unlock(&inode->i_lock); exception->state = lgp->args.ctx->state; + exception->stateid = &lgp->args.stateid; break; }