From 47b7dc993318a702d010bbbbfc78e8da433b6853 Mon Sep 17 00:00:00 2001 From: Rick Macklem Date: Tue, 16 Jun 2009 13:52:21 +0000 Subject: [PATCH] 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) --- sys/fs/nfs/nfsport.h | 2 +- sys/fs/nfsserver/nfs_nfsdstate.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index 5712eae9766..b9f841b430e 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -628,7 +628,7 @@ int nfsmsleep(void *, void *, int, const char *, struct timespec *); * 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. diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 27fe446dc21..077ce2aa5c2 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -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; /*