From patchwork Tue Nov 4 23:36:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 5231361 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0B8B59FD2E for ; Tue, 4 Nov 2014 23:36:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3409220117 for ; Tue, 4 Nov 2014 23:36:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BB922015E for ; Tue, 4 Nov 2014 23:36:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751832AbaKDXgf (ORCPT ); Tue, 4 Nov 2014 18:36:35 -0500 Received: from mail-ig0-f182.google.com ([209.85.213.182]:36527 "EHLO mail-ig0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751435AbaKDXge (ORCPT ); Tue, 4 Nov 2014 18:36:34 -0500 Received: by mail-ig0-f182.google.com with SMTP id hn18so389402igb.9 for ; Tue, 04 Nov 2014 15:36:34 -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=vjD7w0KR77tjSxVJwzPao2L2eQXP+UkQXQBgKmGt68Y=; b=Bf3f2Aglh8PiTEPmvP3hiSMxjrM1JkiAxxsCCUl8eregd1vDz5PKQj+PuOIoOxbH8N X7BZm/wfbePHYOMhBEzMWeKz0Es1VA1TmM68FU+UdfHhSGDi/Hufloo0aAIMwMbfdvTk BO3lUMvDlOWxmGGzS90OTBO2lR9OIbxGfW+nO8rmkQg2AHFsav30XEFpJ0XNe1KSRNdg ewPJHUL4UtN2HaR5FLjDljiWOtERgSWqNCgt6Z2Dyqzc/eXQU//0siSpO942IzB0LDW+ MCIuHSX3rgEJeegt21N4oiH1sm96lG9W8xlmVHKnozDWyYEmlg4mtHB60+F48VWxS1xE Jm0g== X-Gm-Message-State: ALoCoQl1fR+FTbZJ4XsUWJdUx2jQjT68k/oBUxlvXsK8H7GB8BryZFkanLZlWfLu10Xeim0GzypH X-Received: by 10.107.30.68 with SMTP id e65mr31574601ioe.9.1415144194270; Tue, 04 Nov 2014 15:36:34 -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 n75sm805164ion.41.2014.11.04.15.36.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Nov 2014 15:36:33 -0800 (PST) From: Trond Myklebust To: Olga Kornievskaia Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/3] NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are revoked Date: Tue, 4 Nov 2014 17:36:27 -0600 Message-Id: <1415144188-17193-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415144188-17193-1-git-send-email-trond.myklebust@primarydata.com> References: <1415144188-17193-1-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/nfs4proc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d8f352d8c75f..6cf49af3092d 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); @@ -4849,9 +4844,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;