From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B6ACC352A3 for ; Mon, 10 Feb 2020 13:17:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3455D2070A for ; Mon, 10 Feb 2020 13:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581340676; bh=V+Z/dCryjszG9zEWn5Vhxv+vMDYsQBbrdjNEh0IcaJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XHsOMqzHS3wE4fVNR26AvbQp1Si3vVeoGXbfPk2OCfGs82MKc6/R/22jxYnREO7Uz 3afQ8YwUXSaOohzz0VPncqdkaUtQg9ZiX6+6xHySYSevH69RbBQkKReM/iqxba+og5 GrqugopKUgWKqFBg5YrILGICR1ARx+G9i8tPCQno= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728982AbgBJNRz (ORCPT ); Mon, 10 Feb 2020 08:17:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:60762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728978AbgBJMh7 (ORCPT ); Mon, 10 Feb 2020 07:37:59 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9F27D2085B; Mon, 10 Feb 2020 12:37:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338278; bh=V+Z/dCryjszG9zEWn5Vhxv+vMDYsQBbrdjNEh0IcaJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N6UBumVTRDcvnL/QrLGSbF1B0+p7ATHREikMENC+muSVg9VbEEmxdqQTjgW4rn6I4 dTEhqjr/Zw4HExV0WUxwqkaaA9RT4/Oy7PsFnHWOzUP2PpDQvjgo32TRpffiZVyyqc nZhmL7gq5J0kEj6dvgVQ1nUbqSjdtkWX9cYeauOY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , "J. Bruce Fields" Subject: [PATCH 5.4 167/309] nfsd: fix filecache lookup Date: Mon, 10 Feb 2020 04:32:03 -0800 Message-Id: <20200210122422.351415309@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122406.106356946@linuxfoundation.org> References: <20200210122406.106356946@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Trond Myklebust commit 28c7d86bb6172ffbb1a1237c6388e77f9fe5f181 upstream. If the lookup keeps finding a nfsd_file with an unhashed open file, then retry once only. Signed-off-by: Trond Myklebust Cc: stable@vger.kernel.org Fixes: 65294c1f2c5e "nfsd: add a new struct file caching facility to nfsd" Signed-off-by: J. Bruce Fields Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/filecache.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -791,6 +791,7 @@ nfsd_file_acquire(struct svc_rqst *rqstp struct nfsd_file *nf, *new; struct inode *inode; unsigned int hashval; + bool retry = true; /* FIXME: skip this if fh_dentry is already set? */ status = fh_verify(rqstp, fhp, S_IFREG, @@ -826,6 +827,11 @@ wait_for_construction: /* Did construction of this file fail? */ if (!test_bit(NFSD_FILE_HASHED, &nf->nf_flags)) { + if (!retry) { + status = nfserr_jukebox; + goto out; + } + retry = false; nfsd_file_put_noref(nf); goto retry; }