[src/netbsd-7]: src/sys/nfs Pull up following revision(s) (requested by chs i...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/69f2d1336767
branches:  netbsd-7
changeset: 799349:69f2d1336767
user:      snj <snj%NetBSD.org@localhost>
date:      Tue May 19 04:56:45 2015 +0000

description:
Pull up following revision(s) (requested by chs in ticket #769):
        sys/nfs/nfs_vnops.c: revision 1.308
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.

diffstat:

 sys/nfs/nfs_vnops.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 7d19ecb969c6 -r 69f2d1336767 sys/nfs/nfs_vnops.c
--- a/sys/nfs/nfs_vnops.c       Tue May 19 04:53:02 2015 +0000
+++ b/sys/nfs/nfs_vnops.c       Tue May 19 04:56:45 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_vnops.c,v 1.306 2014/07/25 08:20:53 dholland Exp $ */
+/*     $NetBSD: nfs_vnops.c,v 1.306.2.1 2015/05/19 04:56:45 snj Exp $  */
 
 /*
  * Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.306 2014/07/25 08:20:53 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.306.2.1 2015/05/19 04:56:45 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -1311,7 +1311,7 @@
        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]++;