diff options
author | Doug Rabson <dfr@FreeBSD.org> | 1998-06-07 17:13:14 +0000 |
---|---|---|
committer | Doug Rabson <dfr@FreeBSD.org> | 1998-06-07 17:13:14 +0000 |
commit | ecbb00a2629050fd720dc376a33c45f4ad767cea (patch) | |
tree | 1113fd99d363889650b503b7f993603f9423465a /sys/nfsclient | |
parent | 37a8b7dcb8bdd78373c1d4afa4c423c119314e86 (diff) | |
download | src-ecbb00a2629050fd720dc376a33c45f4ad767cea.tar.gz src-ecbb00a2629050fd720dc376a33c45f4ad767cea.zip |
This commit fixes various 64bit portability problems required for
FreeBSD/alpha. The most significant item is to change the command
argument to ioctl functions from int to u_long. This change brings us
inline with various other BSD versions. Driver writers may like to
use (__FreeBSD_version == 300003) to detect this change.
The prototype FreeBSD/alpha machdep will follow in a couple of days
time.
Notes
Notes:
svn path=/head/; revision=36735
Diffstat (limited to 'sys/nfsclient')
-rw-r--r-- | sys/nfsclient/nfs_socket.c | 6 | ||||
-rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index 55a003c2ab79..faf6ed9255a4 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95 - * $Id: nfs_socket.c,v 1.39 1998/05/31 19:49:30 peter Exp $ + * $Id: nfs_socket.c,v 1.40 1998/05/31 20:08:54 peter Exp $ */ /* @@ -1594,10 +1594,10 @@ nfs_realign(m, hsiz) * This never happens for UDP, rarely happens for TCP * but frequently happens for iso transport. */ - if ((m->m_len & 0x3) || (mtod(m, int) & 0x3)) { + if ((m->m_len & 0x3) || (mtod(m, long) & 0x3)) { olen = m->m_len; fcp = mtod(m, caddr_t); - if ((int)fcp & 0x3) { + if ((long)fcp & 0x3) { m->m_flags &= ~M_PKTHDR; if (m->m_flags & M_EXT) m->m_data = m->m_ext.ext_buf + diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 9aec4083bb1d..c8cf13aa868b 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 - * $Id: nfs_vfsops.c,v 1.70 1998/06/01 10:01:31 peter Exp $ + * $Id: nfs_vfsops.c,v 1.71 1998/06/01 11:07:16 peter Exp $ */ #include <sys/param.h> @@ -748,7 +748,7 @@ nfs_mount(mp, path, data, ndp, p) struct sockaddr *nam; struct vnode *vp; char pth[MNAMELEN], hst[MNAMELEN]; - u_int len; + size_t len; u_char nfh[NFSX_V3FHMAX]; if (path == NULL) { |