summaryrefslogtreecommitdiff
path: root/sys/nfsclient/nfs_socket.c
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2004-06-16 03:12:50 +0000
committerRobert Watson <rwatson@FreeBSD.org>2004-06-16 03:12:50 +0000
commit9ef2900f9da0dd7f42a8023cf2eaad2480f2bafd (patch)
tree86014787a1f2347c770ead556207b42cb31b73fe /sys/nfsclient/nfs_socket.c
parent82d8e6f5a091d38fbdd8e40875a8cad7577673fc (diff)
Notes
Diffstat (limited to 'sys/nfsclient/nfs_socket.c')
-rw-r--r--sys/nfsclient/nfs_socket.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 2f2b4774a5df..4485cd29c701 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()