NFS: When resending after a short write, reset the reply count to zero

If we're resending a write due to a short read or write, ensure we reset the reply count to zero. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
mariux64 · Jan 15, 2020 · 8c9cb71 · 8c9cb71
1 parent e8194b7
commit 8c9cb71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
@@ -281,6 +281,8 @@ static void nfs_readpage_retry(struct rpc_task *task,
 	argp->offset += resp->count;
 	argp->pgbase += resp->count;
 	argp->count -= resp->count;
+	resp->count = 0;
+	resp->eof = 0;
 	rpc_restart_call_prepare(task);
 }
 

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
@@ -1658,6 +1658,8 @@ static void nfs_writeback_result(struct rpc_task *task,
 			 */
 			argp->stable = NFS_FILE_SYNC;
 		}
+		resp->count = 0;
+		resp->verf->committed = 0;
 		rpc_restart_call_prepare(task);
 	}
 }