From patchwork Fri Dec 19 18:10:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 5521151 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 153CEBEEA8 for ; Fri, 19 Dec 2014 18:11:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A1ED2011B for ; Fri, 19 Dec 2014 18:11:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F77D2013D for ; Fri, 19 Dec 2014 18:11:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751488AbaLSSLa (ORCPT ); Fri, 19 Dec 2014 13:11:30 -0500 Received: from mail-ig0-f176.google.com ([209.85.213.176]:48631 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751341AbaLSSL3 (ORCPT ); Fri, 19 Dec 2014 13:11:29 -0500 Received: by mail-ig0-f176.google.com with SMTP id l13so1153617iga.3 for ; Fri, 19 Dec 2014 10:11:29 -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:in-reply-to:references; bh=6J+9at8g2xkYflm9SBnypmm94Gv3/Mn7cfNltNbF8I4=; b=WeTB1JotNLzUq+yHHaFe3vqgvTwT3U9ssmJuRm1FNku+vdnpa5nklPS4rsNq8sFB5H WJPk1U6ElqLAgDOf+iGKq6C8hrUBw0QOHcMjmiR0u+u0s06427REulyXxMQBfWZV0/bv ESoNtuBRZBS75hoIoeP3aH0mnxxzip5el4ALtt918mf84qlHs6fkjY71HrzL43/UmkhR XNmP4cGF/jp81reAIlSoo1RR37kkiPsG7q31mLHnxu2pLkE/3oTu9BX4VnBeA4ZJSe6u GI1EFqo36Kj2LSZliEYWI2gbWk8GnNmHpWDA8TlpWOuVDxCkEvR9IrO7r6D5n8ET1ULz wfFg== X-Gm-Message-State: ALoCoQkxJsqtNv3UNkcBPE/0tbv3AwhreaSgJRGcp9kd4r2u20k/TtCSdc1ApDVisO1OUL7W1rUW X-Received: by 10.107.14.12 with SMTP id 12mr9005677ioo.65.1419012689064; Fri, 19 Dec 2014 10:11:29 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-68-40-185-14.hsd1.mi.comcast.net. [68.40.185.14]) by mx.google.com with ESMTPSA id m15sm4839655iom.44.2014.12.19.10.11.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Dec 2014 10:11:28 -0800 (PST) From: Trond Myklebust To: Olga Kornievskaia Cc: linux-nfs Subject: [PATCH 2/2] NFSv4: Remove incorrect check in can_open_delegated() Date: Fri, 19 Dec 2014 13:10:41 -0500 Message-Id: <1419012641-8564-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1419012641-8564-1-git-send-email-trond.myklebust@primarydata.com> References: <1419012641-8564-1-git-send-email-trond.myklebust@primarydata.com> In-Reply-To: References: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Remove an incorrect check for NFS_DELEGATION_NEED_RECLAIM in can_open_delegated(). We are allowed to cache opens even in a situation where we're doing reboot recovery. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 8514b59a8c30..002c7dfedb08 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1119,8 +1119,6 @@ static int can_open_delegated(struct nfs_delegation *delegation, fmode_t fmode) return 0; if ((delegation->type & fmode) != fmode) return 0; - if (test_bit(NFS_DELEGATION_NEED_RECLAIM, &delegation->flags)) - return 0; if (test_bit(NFS_DELEGATION_RETURNING, &delegation->flags)) return 0; nfs_mark_delegation_referenced(delegation);