diff options
| author | sam <sam@FreeBSD.org> | 2003-11-07 22:57:09 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2003-11-07 22:57:09 +0000 |
| commit | 3eac15aaa3639582c3322e6618f161330a3cd761 (patch) | |
| tree | 155ef0fdfb8e324ae21ca64209357e0bad83e00e /sys/nfsserver | |
| parent | 866f946f371c2b4d26a0fe2566bc63f5245ddb2e (diff) | |
| download | FreeBSD-src-3eac15aaa3639582c3322e6618f161330a3cd761.zip FreeBSD-src-3eac15aaa3639582c3322e6618f161330a3cd761.tar.gz | |
Assert GIANT_REQUIRED where sockets are manipulated. This is
preparatory for MPSAFE network commits and ongoing socket
locking work.
Supported by: FreeBSD Foundation
Diffstat (limited to 'sys/nfsserver')
| -rw-r--r-- | sys/nfsserver/nfs_srvsock.c | 4 | ||||
| -rw-r--r-- | sys/nfsserver/nfs_syscalls.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index e5673ec..d480806 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -425,6 +425,8 @@ nfsrv_rcv(struct socket *so, void *arg, int waitflag) goto dorecs; } #endif + GIANT_REQUIRED; /* XXX until socket locking is done */ + auio.uio_td = NULL; if (so->so_type == SOCK_STREAM) { /* @@ -725,6 +727,8 @@ nfsrv_send(struct socket *so, struct sockaddr *nam, struct mbuf *top) struct sockaddr *sendnam; int error, soflags, flags; + GIANT_REQUIRED; /* XXX until socket locking is done */ + soflags = so->so_proto->pr_flags; if ((soflags & PR_CONNREQUIRED) || (so->so_state & SS_ISCONNECTED)) sendnam = NULL; diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c index f4d0c76..2533038 100644 --- a/sys/nfsserver/nfs_syscalls.c +++ b/sys/nfsserver/nfs_syscalls.c @@ -199,6 +199,8 @@ nfssvc_addsock(struct file *fp, struct sockaddr *mynam, struct thread *td) struct socket *so; int error, s; + GIANT_REQUIRED; /* XXX until socket locking done */ + so = fp->f_data; #if 0 tslp = NULL; |
