From patchwork Wed Nov 12 22:31:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 5292341 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 48230C11AC for ; Wed, 12 Nov 2014 22:32:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6BB5F201F2 for ; Wed, 12 Nov 2014 22:32:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B7C120136 for ; Wed, 12 Nov 2014 22:32:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752861AbaKLWcW (ORCPT ); Wed, 12 Nov 2014 17:32:22 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:37211 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752814AbaKLWcW (ORCPT ); Wed, 12 Nov 2014 17:32:22 -0500 Received: by mail-ie0-f173.google.com with SMTP id tr6so14618493ieb.32 for ; Wed, 12 Nov 2014 14:32:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=O6B2a42P6z60wp7xb1JN0wbpMsTlS1Q+8i2AWcB+B5Y=; b=HsJ1zAw1/BfYON90RUbDB7ivPEiIIpP7hhckfy+4dl6EtNCDrieBUwIgqDXIe4r6Sd Ka3OqlGmiVBFV0v6E9vTHZIBUmyg4gRxCscDtOKWMLJOqYVJfxYAGSgYjGmZjBw+DtAu tTZQMSPd2J5Jk2agZiHEWls78Jy6PF2xWVLf3zPqYZ43ZPa3vEPf8vzT/I2eS21a66GL WEntqMKy+WPj9sMzDGwF/mx2wjZo8NoXxtwdIjJ2MYqnFO8V//kmBx+L2a7fmT7P9HDJ zU0zIpyNAv19WqKzX33+KzTiw9ieuzdl4xcz+ayiUq0DLaxdnQudvbgJQaIGWKgbEFk7 InJg== X-Gm-Message-State: ALoCoQkCbV45IPW9ikKcfCxpS+j1Mcj7DbEbdr4h+9ZXINQsR6POY/aJii6qOtzhVlMR5o5c7W/q X-Received: by 10.42.114.201 with SMTP id h9mr1446510icq.94.1415831541573; Wed, 12 Nov 2014 14:32:21 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-73-190-61-247.hsd1.mi.comcast.net. [73.190.61.247]) by mx.google.com with ESMTPSA id nu1sm90916igb.0.2014.11.12.14.32.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Nov 2014 14:32:20 -0800 (PST) From: Trond Myklebust To: Olga Kornievskaia Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 4/5] NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are revoked Date: Wed, 12 Nov 2014 17:31:53 -0500 Message-Id: <1415831514-47005-5-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415831514-47005-4-git-send-email-trond.myklebust@primarydata.com> References: <1415831514-47005-1-git-send-email-trond.myklebust@primarydata.com> <1415831514-47005-2-git-send-email-trond.myklebust@primarydata.com> <1415831514-47005-3-git-send-email-trond.myklebust@primarydata.com> <1415831514-47005-4-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-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP NFSv4.x (x>0) requires us to call TEST_STATEID+FREE_STATEID if a stateid is revoked. We will currently fail to do this if the stateid is a delegation. http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust --- fs/nfs/filelayout/filelayout.c | 3 --- fs/nfs/nfs4proc.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c index 46fab1cb455a..7afb52f6a25a 100644 --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c @@ -145,9 +145,6 @@ static int filelayout_async_handle_error(struct rpc_task *task, case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_BAD_STATEID: - if (state == NULL) - break; - nfs_remove_bad_delegation(state->inode); case -NFS4ERR_OPENMODE: if (state == NULL) break; diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 4b7166f4e1cf..69dc20a743f9 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -370,11 +370,6 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_BAD_STATEID: - if (inode != NULL && nfs4_have_delegation(inode, FMODE_READ)) { - nfs_remove_bad_delegation(inode); - exception->retry = 1; - break; - } if (state == NULL) break; ret = nfs4_schedule_stateid_recovery(server, state); @@ -4844,9 +4839,6 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_ADMIN_REVOKED: case -NFS4ERR_BAD_STATEID: - if (state == NULL) - break; - nfs_remove_bad_delegation(state->inode); case -NFS4ERR_OPENMODE: if (state == NULL) break;