svn commit: r194292 - in head/sys/fs: nfs nfsserver

[Rick Macklem]

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;
 
 	/*