Module Name: src
Committed By: chs
Date: Thu May 14 17:35:54 UTC 2015
Modified Files:
src/sys/nfs: nfs_vnops.c
Log Message:
in nfs_writerpc(), avoid a signed/unsigned problem in computing the
number of bytes to back up in the uio when we need to resend a write RPC
(eg. after a server crash) on a 64-bit platform. should fix PR 35448.
To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/sys/nfs/nfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.307 src/sys/nfs/nfs_vnops.c:1.308
--- src/sys/nfs/nfs_vnops.c:1.307 Mon Apr 20 23:03:09 2015
+++ src/sys/nfs/nfs_vnops.c Thu May 14 17:35:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.307 2015/04/20 23:03:09 riastradh Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.308 2015/05/14 17:35:54 chs Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.307 2015/04/20 23:03:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.308 2015/05/14 17:35:54 chs Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -1311,7 +1311,7 @@ retry:
byte_count = 0; /* count of bytes actually written */
while (tsiz > 0) {
uint32_t datalen; /* data bytes need to be allocated in mbuf */
- uint32_t backup;
+ size_t backup;
bool stalewriteverf = false;
nfsstats.rpccnt[NFSPROC_WRITE]++;
