summaryrefslogtreecommitdiffstats
path: root/sys/nfs
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>1998-06-07 17:13:14 +0000
committerdfr <dfr@FreeBSD.org>1998-06-07 17:13:14 +0000
commit1d5f38ac2264102518a09c66a7b285f57e81e67e (patch)
tree83ce2f0e2b8041d2c933d3beffc1f4465ea5b929 /sys/nfs
parent83423d0e5a4ad035e44392f0427cb39232031e45 (diff)
downloadFreeBSD-src-1d5f38ac2264102518a09c66a7b285f57e81e67e.zip
FreeBSD-src-1d5f38ac2264102518a09c66a7b285f57e81e67e.tar.gz
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.
Diffstat (limited to 'sys/nfs')
-rw-r--r--sys/nfs/nfs_serv.c6
-rw-r--r--sys/nfs/nfs_socket.c6
-rw-r--r--sys/nfs/nfs_vfsops.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 2b1e586..d701213 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_serv.c 8.8 (Berkeley) 7/31/95
- * $Id: nfs_serv.c,v 1.67 1998/05/31 19:43:34 peter Exp $
+ * $Id: nfs_serv.c,v 1.68 1998/05/31 20:08:52 peter Exp $
*/
/*
@@ -3311,8 +3311,8 @@ nfsrv_pathconf(nfsd, slp, procp, mrq)
register struct nfsv3_pathconf *pc;
register int32_t t1;
caddr_t bpos;
- int error = 0, rdonly, cache, getret = 1, linkmax, namemax;
- int chownres, notrunc;
+ int error = 0, rdonly, cache, getret = 1;
+ register_t linkmax, namemax, chownres, notrunc;
char *cp2;
struct mbuf *mb, *mb2, *mreq;
struct vnode *vp;
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 55a003c..faf6ed9 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/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/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 9aec408..c8cf13a 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/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) {
OpenPOWER on IntegriCloud