Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 5 insertions, 2 deletions

diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 5552fa8b6e12..0f7288b94633 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;
@@ -615,8 +616,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;
 }