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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 0A50FC3A5A6 for ; Thu, 19 Sep 2019 22:30:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE3E420640 for ; Thu, 19 Sep 2019 22:30:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568932228; bh=dLATFpVow7aojoKfxCGuwrnTgzpLrr1z4QSTjwV1B5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ddCkPG1Cn8slM9y0H9Fs8tn6zW/Gd9N19Q76dr1lqBfa8Pv69ruC+N/5wF+mk+gZK 4TUOvjBleu0BQid7QPz2drV147EErFmasnHkejJ/B4BC6nfBLZHfTqYWsByCdBjbm8 38m2OZdlxPUt2VgZHatKFMPBYau6aJ55pNr75UPI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404454AbfISWaY (ORCPT ); Thu, 19 Sep 2019 18:30:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:56596 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404443AbfISWQQ (ORCPT ); Thu, 19 Sep 2019 18:16:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 0DE15218AF; Thu, 19 Sep 2019 22:16:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931375; bh=dLATFpVow7aojoKfxCGuwrnTgzpLrr1z4QSTjwV1B5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RzeMSQJ6HuOs+UNwYPKk28dAvdohi7k0/5/pyXZoUYuGxY2SA6TKEflOhimUo3r2o zMWjHKJmYc7wBeGfXAPyQuAQSc+nUcC61VJJhPS4+12adIoUc6N8GJ3ohlYOUU5Ef6 kgNnq86vy2NB+nzF2MDpIot+7z0cnE4BRPuLz4M8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Sasha Levin Subject: [PATCH 4.14 23/59] NFSv4: Fix return value in nfs_finish_open() Date: Fri, 20 Sep 2019 00:03:38 +0200 Message-Id: <20190919214803.970032400@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214755.852282682@linuxfoundation.org> References: <20190919214755.852282682@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 [ 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