From patchwork Sat Sep 17 05:13:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336999 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 71E986077F for ; Sat, 17 Sep 2016 05:14:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6579329FAD for ; Sat, 17 Sep 2016 05:14:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A76529FCB; Sat, 17 Sep 2016 05:14:03 +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 E16F429FAD for ; Sat, 17 Sep 2016 05:14:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756204AbcIQFOB (ORCPT ); Sat, 17 Sep 2016 01:14:01 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:33412 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757538AbcIQFN6 (ORCPT ); Sat, 17 Sep 2016 01:13:58 -0400 Received: by mail-io0-f193.google.com with SMTP id r145so2386845ior.0 for ; Fri, 16 Sep 2016 22:13:58 -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=t4iZgmocxfzm2fLd/3N6fp9N2TXd7BLP1MZpDJbkN8o=; b=q2aW/31URgejcn8K5HNRZUhWFK+k2KJwdaStf/5QoXFuHcKFDtyohzTNDLe9r/FOvN iyHWeV5ykR64yY29IYmb8t6kdX/XVXhZeCLizfiXDkeT9uFPKPo2GzjYl9oI8lwz++nz dGF9lILjsh0mYK75UnluMOpFjYKSuWxUHhpya8VHwUEuUPFOsUgqXzmGRgPrn6ISJ9fa uae8VKY3b/3NjGSah6n/FuzeIj7ppVpcjk1za45O0sCW1Vdt2kjfhrCUN6S4PfVUbpdI W/usmc4YvUZDBAeGMxw7z74Ey+I3Zm1zxce3aS476Kz/qgsQCBLVenh1KueiltTbr8j6 067g== 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=t4iZgmocxfzm2fLd/3N6fp9N2TXd7BLP1MZpDJbkN8o=; b=Xa6f5VOTskgmdSTbQUrRnT0CqxhuXpD7yPKBD185Od8nvwkCCYkNDDinYiOEwpHLl6 T+Zjs058oEjFdnhdVN0AEOK0iS4P4ln6u2rOCuNReBsHJqEOgLqaPWiA6X4cOi8IirUV 55sk0bxlqDqJR3mpel4yTRtiQUGU5GmB+IpK2D5yoPH373kHl8PkGtuE2rpCukkTmj5F yh0IAmUJQKHUcIa/b0gUV0nhcF7rr30Bir4aLhHU0uVNGQL7eRoKsWG9COkjn+g5/3bl fRhmwob5RC1AGE74dL1CDqEpUQUH8P+Nz06ko3CuXvxIf847iRwsA3aNXVuocaVSMqJY oG4g== X-Gm-Message-State: AE9vXwP8poTOIvETJiGtb17Xqw0Sb0kGIIKSRdShyyCp04/BlSs9u+QLwvhTjq0Ce7A/Xw== X-Received: by 10.107.170.168 with SMTP id g40mr26589781ioj.173.1474089237569; Fri, 16 Sep 2016 22:13:57 -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.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:57 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 23/25] NFS: Always call nfs_inode_find_state_and_recover() when revoking a delegation Date: Sat, 17 Sep 2016 01:13:31 -0400 Message-Id: <1474089213-104014-24-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-23-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> <1474089213-104014-20-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-21-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-22-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-23-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 45b97cf4bab1..62b2215a30b9 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -653,18 +653,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; } @@ -676,10 +682,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);