Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-ig0-f169.google.com ([209.85.213.169]:52245 "EHLO mail-ig0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751529AbaLSSwy (ORCPT ); Fri, 19 Dec 2014 13:52:54 -0500 Received: by mail-ig0-f169.google.com with SMTP id hl2so2537740igb.4 for ; Fri, 19 Dec 2014 10:52:53 -0800 (PST) From: Trond Myklebust To: Olga Kornievskaia Cc: linux-nfs Subject: [PATCH v2 2/2] NFSv4: Remove incorrect check in can_open_delegated() Date: Fri, 19 Dec 2014 13:52:34 -0500 Message-Id: <1419015154-91037-2-git-send-email-trond.myklebust@primarydata.com> In-Reply-To: <1419015154-91037-1-git-send-email-trond.myklebust@primarydata.com> References: <1419015154-91037-1-git-send-email-trond.myklebust@primarydata.com> In-Reply-To: References: Sender: linux-nfs-owner@vger.kernel.org List-ID: 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); -- 2.1.0