diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2009-06-16 13:52:21 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2009-06-16 13:52:21 +0000 |
| commit | 2afe9481563104fa0f08d2dd80e271b40b7681b2 (patch) | |
| tree | 1716d9790a08aff6ddae9d0d11731a06c8f819a9 /sys/fs | |
| parent | 9d18ee7303ef26826d2c96ca85f93c5aa631e565 (diff) | |
| download | FreeBSD-src-2afe9481563104fa0f08d2dd80e271b40b7681b2.zip FreeBSD-src-2afe9481563104fa0f08d2dd80e271b40b7681b2.tar.gz | |
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)
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/nfs/nfsport.h | 2 | ||||
| -rw-r--r-- | 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 5712eae..b9f841b 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 27fe446..077ce2a 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; /* |
