Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put more ISO bits under ifdef ISO.

Browse Source
This commit is contained in:
chs 2000-11-24 23:30:02 +00:00
parent 2a6c823e89
commit 8362134916
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/nfs/nfs_nqlease.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_nqlease.c,v 1.34 2000/09/19 23:26:26 bjh21 Exp $ */
/* $NetBSD: nfs_nqlease.c,v 1.35 2000/11/24 23:30:02 chs Exp $ */
/*
* Copyright (c) 1992, 1993
@ -124,7 +124,10 @@ int nqnfs_piggy[NFS_NPROCS] = {
extern nfstype nfsv2_type[9];
extern nfstype nfsv3_type[9];
extern struct nfssvc_sock *nfs_udpsock, *nfs_cltpsock;
extern struct nfssvc_sock *nfs_udpsock;
#ifdef ISO
extern struct nfssvc_sock *nfs_cltpsock
#endif
#ifdef INET6
extern struct nfssvc_sock *nfs_udp6sock;
#endif
@ -342,9 +345,11 @@ nqsrv_addhost(lph, slp, nam)
lph->lph_nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
lph->lph_flag |= (LC_VALID | LC_UDP6);
#endif
#ifdef ISO
} else if (slp == nfs_cltpsock) {
lph->lph_nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
lph->lph_flag |= (LC_VALID | LC_CLTP);
#endif
} else {
lph->lph_flag |= (LC_VALID | LC_SREF);
lph->lph_slp = slp;
@ -410,7 +415,10 @@ nqsrv_cmpnam(slp, nam, lph)
else
return (0);
}
if (slp == nfs_udpsock || slp == nfs_cltpsock
if (slp == nfs_udpsock
#ifdef ISO
|| slp == nfs_cltpsock
#endif
#ifdef INET6
|| slp == nfs_udp6sock
#endif
@ -473,9 +481,11 @@ nqsrv_send_eviction(vp, lp, slp, nam, cred)
saddr->sin_addr.s_addr = lph->lph_inetaddr;
saddr->sin_port = lph->lph_port;
so = nfs_udpsock->ns_so;
#ifdef ISO
} else if (lph->lph_flag & LC_CLTP) {
nam2 = lph->lph_nam;
so = nfs_cltpsock->ns_so;
#endif
#ifdef INET6
} else if (lph->lph_flag & LC_UDP6) {
nam2 = lph->lph_nam;

9
sys/nfs/nfs_syscalls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_syscalls.c,v 1.46 2000/10/24 07:08:48 matt Exp $ */
/* $NetBSD: nfs_syscalls.c,v 1.47 2000/11/24 23:30:03 chs Exp $ */
/*
* Copyright (c) 1989, 1993
@ -96,7 +96,10 @@ extern int nqsrv_writeslack;
extern int nfsrtton;
extern struct nfsstats nfsstats;
extern int nfsrvw_procrastinate;
struct nfssvc_sock *nfs_udpsock, *nfs_cltpsock;
struct nfssvc_sock *nfs_udpsock;
#ifdef ISO
struct nfssvc_sock *nfs_cltpsock;
#endif
#ifdef INET6
struct nfssvc_sock *nfs_udp6sock;
#endif
@ -868,11 +871,13 @@ nfsrv_init(terminating)
TAILQ_INSERT_TAIL(&nfssvc_sockhead, nfs_udp6sock, ns_chain);
#endif
#ifdef ISO
nfs_cltpsock = (struct nfssvc_sock *)
malloc(sizeof (struct nfssvc_sock), M_NFSSVC, M_WAITOK);
memset((caddr_t)nfs_cltpsock, 0, sizeof (struct nfssvc_sock));
TAILQ_INIT(&nfs_cltpsock->ns_uidlruhead);
TAILQ_INSERT_TAIL(&nfssvc_sockhead, nfs_cltpsock, ns_chain);
#endif
}
/*