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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 4F205C3A5AA for ; Wed, 4 Sep 2019 16:08:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F7322070C for ; Wed, 4 Sep 2019 16:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567613300; bh=dLATFpVow7aojoKfxCGuwrnTgzpLrr1z4QSTjwV1B5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XrO3NDXHyqEST4sXNAyx7VJLDYvjJ2ss765Yq0b7T8aUGES27792VWbZrKGWZBGJ8 kRGVFTybXeMWKIjOfezT6Kl+HbyQs5YeHcrmUf+KtN+HaYjukKlp8rRbTAOf7QjY5v qPYbH76B05U5vrP/licaMnDjY7JGZ6WTyov3OrkA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731175AbfIDQIT (ORCPT ); Wed, 4 Sep 2019 12:08:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:37112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733029AbfIDQBe (ORCPT ); Wed, 4 Sep 2019 12:01:34 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BBB072341D; Wed, 4 Sep 2019 16:01:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612894; bh=dLATFpVow7aojoKfxCGuwrnTgzpLrr1z4QSTjwV1B5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q9wfPacHIjCoBoR1lgTLIN1o9mviO5Y/YDa+sYtKLZFBzz1pEMDWyLPob1LS5Hvxq 1KVRRvOeBde5DnI7AxVcTIBfLqEhA963vxQ9461HTfyOtJsAjptnaXFmkRQbG3LIrj T8pU3Fz5o6W9M8I2MI7zcXCmXYOHMR3J3t6xe/DQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 10/36] NFSv4: Fix return value in nfs_finish_open() Date: Wed, 4 Sep 2019 12:00:56 -0400 Message-Id: <20190904160122.4179-10-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904160122.4179-1-sashal@kernel.org> References: <20190904160122.4179-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Trond Myklebust [ Upstream commit 9821421a291b548ef4369c6998745baa36ddecd5 ] If the file turns out to be of the wrong type after opening, we want to revalidate the path and retry, so return EOPENSTALE rather than ESTALE. Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 85a6fdd76e20b..50c181fa00251 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1470,7 +1470,7 @@ static int nfs_finish_open(struct nfs_open_context *ctx, if (S_ISREG(file->f_path.dentry->d_inode->i_mode)) nfs_file_set_open_context(file, ctx); else - err = -ESTALE; + err = -EOPENSTALE; out: return err; } -- 2.20.1