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,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 CF817C3A5A6 for ; Thu, 19 Sep 2019 22:10:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A113F21907 for ; Thu, 19 Sep 2019 22:10:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931041; bh=kIUj63N086jo5gW8T5PEHX5HflmQK9Y16vh87LQ3F2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MP/tU1FFcI9iZOi4iU08wt6E1s9tzE7r9LlXXSyD/mtq8n81wybLpZNfHuIhKgoBZ 8USaKAI931GSkSG6hHfCJT/kU6agpU3PUWP3qoSW1LLAqgOqYW1IV1NkxLesfMLGeC ZD1Gaf1PgDTz0REWlI+AiMYZKnemEC1Dbbq19vL0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405725AbfISWKk (ORCPT ); Thu, 19 Sep 2019 18:10:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:49114 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405721AbfISWKj (ORCPT ); Thu, 19 Sep 2019 18:10:39 -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 004E52196E; Thu, 19 Sep 2019 22:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931039; bh=kIUj63N086jo5gW8T5PEHX5HflmQK9Y16vh87LQ3F2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aVJBGBtB+6IrInGqYuu2Qy+X2Ze0AqFqRRc16UXnB32wwRpm4DHDr7HXWq0qfCtSr 45ulk/JwNkaxwb1gNtFlLn9REQRWJobOZ/i6IPNol06KxkTSYphZ+b92WsdXOOqeej Y2Ok5PI7XhXt1CeVIhM5+AH+CCjRhQD38gb546+A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Sasha Levin Subject: [PATCH 5.2 073/124] NFSv2: Fix eof handling Date: Fri, 20 Sep 2019 00:02:41 +0200 Message-Id: <20190919214821.655959119@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214819.198419517@linuxfoundation.org> References: <20190919214819.198419517@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 71affe9be45a5c60b9772e1b2701710712637274 ] If we received a reply from the server with a zero length read and no error, then that implies we are at eof. Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index 5552fa8b6e128..ec79d2214a78c 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c @@ -594,7 +594,8 @@ static int nfs_read_done(struct rpc_task *task, struct nfs_pgio_header *hdr) /* Emulate the eof flag, which isn't normally needed in NFSv2 * as it is guaranteed to always return the file attributes */ - if (hdr->args.offset + hdr->res.count >= hdr->res.fattr->size) + if ((hdr->res.count == 0 && hdr->args.count > 0) || + hdr->args.offset + hdr->res.count >= hdr->res.fattr->size) hdr->res.eof = 1; } return 0; -- 2.20.1