diff options
Diffstat (limited to 'sys/nfsserver')
| -rw-r--r-- | sys/nfsserver/nfs_serv.c | 6 | ||||
| -rw-r--r-- | sys/nfsserver/nfs_srvsock.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index 2b1e586..d701213 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/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/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index 55a003c..faf6ed9 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.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 + |
