From owner-svn-src-all@FreeBSD.ORG  Tue Jun 16 13:52:21 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C938D1065687;
	Tue, 16 Jun 2009 13:52:21 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B72A28FC20;
	Tue, 16 Jun 2009 13:52:21 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5GDqL3K029699;
	Tue, 16 Jun 2009 13:52:21 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5GDqLIs029697;
	Tue, 16 Jun 2009 13:52:21 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <200906161352.n5GDqLIs029697@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Tue, 16 Jun 2009 13:52:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194292 - in head/sys/fs: nfs nfsserver
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Jun 2009 13:52:22 -0000

Author: rmacklem
Date: Tue Jun 16 13:52:21 2009
New Revision: 194292
URL: http://svn.freebsd.org/changeset/base/194292

Log:
  Remove the "int *" typecast for the aresid argument to vn_rdwr()
  and change the type of the argument from size_t to int. This
  should avoid issues on 64bit architectures.
  
  Suggested by:	kib
  Approved by:	kib (mentor)

Modified:
  head/sys/fs/nfs/nfsport.h
  head/sys/fs/nfsserver/nfs_nfsdstate.c

Modified: head/sys/fs/nfs/nfsport.h
==============================================================================
--- head/sys/fs/nfs/nfsport.h	Tue Jun 16 13:39:09 2009	(r194291)
+++ head/sys/fs/nfs/nfsport.h	Tue Jun 16 13:52:21 2009	(r194292)
@@ -628,7 +628,7 @@ int nfsmsleep(void *, void *, int, const
  * Define whatever it takes to do a vn_rdwr().
  */
 #define	NFSD_RDWR(r, v, b, l, o, s, i, c, a, p) \
-	vn_rdwr((r), (v), (b), (l), (o), (s), (i), (c), NULL, (int *)(a), (p))
+	vn_rdwr((r), (v), (b), (l), (o), (s), (i), (c), NULL, (a), (p))
 
 /*
  * Macros for handling memory for different BSDen.

Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c	Tue Jun 16 13:39:09 2009	(r194291)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c	Tue Jun 16 13:52:21 2009	(r194292)
@@ -3824,7 +3824,7 @@ nfsrv_setupstable(NFSPROC_T *p)
 	struct nfst_rec *tsp;
 	int error, i, tryagain;
 	off_t off = 0;
-	size_t aresid, len;
+	int aresid, len;
 	struct timeval curtime;
 
 	/*