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=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 81C95C3A5A6 for ; Thu, 19 Sep 2019 22:27:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5484D217D6 for ; Thu, 19 Sep 2019 22:27:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568932062; bh=AHZGMLGH7p3cXTEIIRUUmKB1ISTKB3Aln3YLCJhurA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kWPGOkpd378CW6bY+biWgPh8NTlwGdS4UgkWck9U8dx1b14+4o4X1i+Foml0jtLHH VZ7HahQlHJa9ZBq2eh+DQienWwtxvNKUvxVXKZCxLINu+SqUKW/QWOiy66oRTURB9q BEpaC1T8RHzBqNqi6xtJ5g5wwdJq/E0P6AyE5u7M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733115AbfISWUg (ORCPT ); Thu, 19 Sep 2019 18:20:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:34678 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733201AbfISWUf (ORCPT ); Thu, 19 Sep 2019 18:20:35 -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 0261A21907; Thu, 19 Sep 2019 22:20:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931635; bh=AHZGMLGH7p3cXTEIIRUUmKB1ISTKB3Aln3YLCJhurA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Db50uBLh5s6Q57MAY7PA/r9vCjBDGPg0fufedSnhoYAF+S8JEU9I3XDx+jL+fgDcV LFi4fuZYywd+c/wdi+9NR1qCc+RgcW43esHPTNeFB3kQ0Ra3CPsDMkJ6EyNq8ebURf qiWm/60rTsby3v8F2qSfb0NpErwvLffya17jXTa0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jan Stancek , Naresh Kamboju , Trond Myklebust , Sasha Levin Subject: [PATCH 4.9 58/74] NFSv2: Fix write regression Date: Fri, 20 Sep 2019 00:04:11 +0200 Message-Id: <20190919214810.292739132@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214800.519074117@linuxfoundation.org> References: <20190919214800.519074117@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 d33d4beb522987d1c305c12500796f9be3687dee ] Ensure we update the write result count on success, since the RPC call itself does not do so. Reported-by: Jan Stancek Reported-by: Naresh Kamboju Signed-off-by: Trond Myklebust Tested-by: Jan Stancek Signed-off-by: Sasha Levin --- fs/nfs/proc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index f3e8bcbd29a09..06e72229be123 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c @@ -610,8 +610,10 @@ static int nfs_proc_pgio_rpc_prepare(struct rpc_task *task, static int nfs_write_done(struct rpc_task *task, struct nfs_pgio_header *hdr) { - if (task->tk_status >= 0) + if (task->tk_status >= 0) { + hdr->res.count = hdr->args.count; nfs_writeback_update_inode(hdr); + } return 0; } -- 2.20.1