diff options
| author | rwatson <rwatson@FreeBSD.org> | 2004-06-16 03:12:50 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2004-06-16 03:12:50 +0000 |
| commit | 65f0bd9a1085ce613c1231c460305977e35fd10e (patch) | |
| tree | 86014787a1f2347c770ead556207b42cb31b73fe | |
| parent | d82b0bb2469f5a79d160bb6601f8cd8eb3966fab (diff) | |
| download | FreeBSD-src-65f0bd9a1085ce613c1231c460305977e35fd10e.zip FreeBSD-src-65f0bd9a1085ce613c1231c460305977e35fd10e.tar.gz | |
Convert GIANT_REQUIRED to NET_ASSERT_GIANT where Giant is used to
protect socket operations. Leave one "as-is" as it also frobs
rootvp.
| -rw-r--r-- | sys/nfsclient/bootp_subr.c | 2 | ||||
| -rw-r--r-- | sys/nfsclient/krpc_subr.c | 2 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_socket.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c index f21689d..2132ef5 100644 --- a/sys/nfsclient/bootp_subr.c +++ b/sys/nfsclient/bootp_subr.c @@ -591,7 +591,7 @@ bootpc_call(struct bootpc_globalcontext *gctx, struct thread *td) int retry; const char *s; - GIANT_REQUIRED; /* XXX until socket locking done */ + NET_ASSERT_GIANT(); /* * Create socket and set its recieve timeout. diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c index 672b84e..0bcf694 100644 --- a/sys/nfsclient/krpc_subr.c +++ b/sys/nfsclient/krpc_subr.c @@ -215,7 +215,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func, nam = mhead = NULL; from = NULL; - GIANT_REQUIRED; /* XXX until socket locking done */ + NET_ASSERT_GIANT(); /* * Create socket and set its recieve timeout. diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index 2f2b477..4485cd2 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -161,7 +161,7 @@ nfs_connect(struct nfsmount *nmp, struct nfsreq *rep) struct sockaddr *saddr; struct thread *td = &thread0; /* only used for socreate and sobind */ - GIANT_REQUIRED; /* XXX until socket locking done */ + NET_ASSERT_GIANT(); nmp->nm_so = NULL; saddr = nmp->nm_nam; @@ -379,7 +379,7 @@ nfs_disconnect(struct nfsmount *nmp) { struct socket *so; - GIANT_REQUIRED; /* XXX until socket locking done */ + NET_ASSERT_GIANT(); if (nmp->nm_so) { so = nmp->nm_so; @@ -415,7 +415,7 @@ nfs_send(struct socket *so, struct sockaddr *nam, struct mbuf *top, struct sockaddr *sendnam; int error, soflags, flags; - GIANT_REQUIRED; /* XXX until socket locking done */ + NET_ASSERT_GIANT(); KASSERT(rep, ("nfs_send: called with rep == NULL")); @@ -498,7 +498,7 @@ nfs_receive(struct nfsreq *rep, struct sockaddr **aname, struct mbuf **mp) int error, sotype, rcvflg; struct thread *td = curthread; /* XXX */ - GIANT_REQUIRED; /* XXX until socket locking done */ + NET_ASSERT_GIANT(); /* * Set up arguments for soreceive() |
