From patchwork Mon Feb 10 12:33:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 231788 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 B6B55C352A5 for ; Mon, 10 Feb 2020 13:13:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 856C32070A for ; Mon, 10 Feb 2020 13:13:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581340395; bh=mOBlwavlbau8vB+rE6PQapruNs+NJ/+2dgZdrnVFrF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UMpwpm3ij6afHQDXvhFdpWYPhx4ptM5zxRwlhYDo84KkEgUcSD+9NsPqSNMSacq7Y 31iqzSXPCSH2r6FQp9nthRjfm347FcZspnFrLZDx65WSGf9Vw3WarlmidM31I04IjS 7Ca6VzkpKt7u8syoXCUv5qUe2z+KAt75unTNEt1I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729667AbgBJNNP (ORCPT ); Mon, 10 Feb 2020 08:13:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:34802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728644AbgBJMim (ORCPT ); Mon, 10 Feb 2020 07:38:42 -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 873B220838; Mon, 10 Feb 2020 12:38:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338322; bh=mOBlwavlbau8vB+rE6PQapruNs+NJ/+2dgZdrnVFrF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rvH8De426HWXAFkVFqqyIfH5pGh1T3mydF5Y6bHWKqrr/VkCBq6M5OSxbBSvdS0A2 zsgy+a069LJvcF5Vp+lmNbhT2uwNy2iClbKyAQ2anN5kXEQzyXSkJol/ip65UU2Tic 3qAZT9tzw+VdZkkS6VxLKzwqi2IXK2WXPkL8fHbk= 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 255/309] nfsd: Return the correct number of bytes written to the file Date: Mon, 10 Feb 2020 04:33:31 -0800 Message-Id: <20200210122431.068233998@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 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Trond Myklebust commit 09a80f2aef06b7c86143f5c14efd3485e0d2c139 upstream. We must allow for the fact that iov_iter_write() could have returned a short write (e.g. if there was an ENOSPC issue). Fixes: d890be159a71 "nfsd: Add I/O trace points in the NFSv4 write path" Signed-off-by: Trond Myklebust Signed-off-by: J. Bruce Fields Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/vfs.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -975,6 +975,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s host_err = vfs_iter_write(file, &iter, &pos, flags); if (host_err < 0) goto out_nfserr; + *cnt = host_err; nfsdstats.io_write += *cnt; fsnotify_modify(file);