From patchwork Tue Sep 20 16:56:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9342151 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 CFCAC60B16 for ; Tue, 20 Sep 2016 16:56:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1C1629495 for ; Tue, 20 Sep 2016 16:56:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6A17295AB; Tue, 20 Sep 2016 16:56:52 +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 679CF29981 for ; Tue, 20 Sep 2016 16:56:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932368AbcITQ4v (ORCPT ); Tue, 20 Sep 2016 12:56:51 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:33953 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932692AbcITQ4u (ORCPT ); Tue, 20 Sep 2016 12:56:50 -0400 Received: by mail-qt0-f194.google.com with SMTP id e5so720453qtb.1 for ; Tue, 20 Sep 2016 09:56:49 -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=wGE15t7r9IDWt11QYU9kgjSoCm0DHFVAX6l2tDw0QHg=; b=EcViS8uVsl0KUjeaHEsicIs1WMC80fhMUy1O68pdS78qBi5kVm09cCEquKj5Ay51zg WosCBNgAtT3hhRD4m2OzlygfxhhFKyyvZ4CLlUECABd6pWNRTVieXYGwC7PQBz9/Q2qo 3R/qE6r7ZW3qZ5/xVP4XCl3n2e+DLe7P/1GQ6MS3mGzfrYeBkMQuopNQqcBwtTJSLfcs CoV3xFkT+rQbGN2Xsx4Th4I965vCygQ3HQv1sOA4sn2wnLwHViswRR3C/7K5qp4BQ7Zt 1fATv0brs8KCSlky1glj/6RcetnL1eo+7GPqH7mB3qqI4R+WdB7AJMjnhqrTHdE7NjZh eP7g== 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=wGE15t7r9IDWt11QYU9kgjSoCm0DHFVAX6l2tDw0QHg=; b=a/PeXBuqSjZQInXvpgcE17ejP0N/5JnCGGGsXWgSmrjR/+sBb9BvYx1PvhMZwbbTq4 Md2cQjWZK09a7AhSDGVN8+4dJnVgpozaIPAHr94Lykns5WZ1P4vBbEFQEh3XTRNZn9Q3 66WoDyjgQn5tKhQflswiFTdVdKansa18PtqSTnNX7rfTYm9DRSfjuYRlDtUQPJBa+TUY qSVH2GtQ3uFiWe+Owtit+9YQgzI18lucYdNfn0NnJwW9dxeKT+FO0t1DaUH4GdBCvUIH l+nI3ukrMpVS2hW0W8oLvzQeGzpwj0JEGvhvjPxjeEIrWyn8AVELYULSORwFUrfe88ef A3ww== X-Gm-Message-State: AE9vXwNJNicgmIQHKH4FKDLwheM8iQ2LDHXza2Q2tsqTUZGMcsSNySdnjD0OluQ+Wcp8jg== X-Received: by 10.237.37.220 with SMTP id y28mr37385094qtc.8.1474390609360; Tue, 20 Sep 2016 09:56:49 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-108-86-94.adr01.mskg.mi.frontiernet.net. [50.108.86.94]) by smtp.gmail.com with ESMTPSA id i4sm16537202qte.40.2016.09.20.09.56.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 09:56:48 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v6 24/29] NFS: Always call nfs_inode_find_state_and_recover() when revoking a delegation Date: Tue, 20 Sep 2016 12:56:06 -0400 Message-Id: <1474390571-17106-25-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474390571-17106-24-git-send-email-trond.myklebust@primarydata.com> References: <1474390571-17106-1-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-2-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-3-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-4-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-5-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-6-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-7-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-8-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-9-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-10-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-11-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-12-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-13-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-14-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-15-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-16-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-17-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-18-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-19-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-20-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-21-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-22-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-23-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-24-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 Don't rely on nfs_inode_detach_delegation() succeeding. That can race... Signed-off-by: Trond Myklebust --- fs/nfs/delegation.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 2a441ad4e226..0073848b5ad3 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -662,18 +662,24 @@ static bool nfs_revoke_delegation(struct inode *inode, const nfs4_stateid *stateid) { struct nfs_delegation *delegation; + nfs4_stateid tmp; bool ret = false; rcu_read_lock(); delegation = rcu_dereference(NFS_I(inode)->delegation); if (delegation == NULL) goto out; - if (stateid && !nfs4_stateid_match(stateid, &delegation->stateid)) + if (stateid == NULL) { + nfs4_stateid_copy(&tmp, &delegation->stateid); + stateid = &tmp; + } else if (!nfs4_stateid_match(stateid, &delegation->stateid)) goto out; nfs_mark_delegation_revoked(NFS_SERVER(inode), delegation); ret = true; out: rcu_read_unlock(); + if (ret) + nfs_inode_find_state_and_recover(inode, stateid); return ret; } @@ -685,10 +691,8 @@ void nfs_remove_bad_delegation(struct inode *inode, if (!nfs_revoke_delegation(inode, stateid)) return; delegation = nfs_inode_detach_delegation(inode); - if (delegation) { - nfs_inode_find_state_and_recover(inode, &delegation->stateid); + if (delegation) nfs_free_delegation(delegation); - } } EXPORT_SYMBOL_GPL(nfs_remove_bad_delegation);