diff options
| author | rwatson <rwatson@FreeBSD.org> | 2007-08-06 14:26:03 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2007-08-06 14:26:03 +0000 |
| commit | 23574c86734ab5cb088584d30345e698cbbeaef2 (patch) | |
| tree | 63e9e0c42ec5669b83e25b5f9cbdcbee7e1be6dc /sys/compat/linux/linux_socket.c | |
| parent | 5f4b9d20fc4bf36bf86f78bb1622ee474a93dc56 (diff) | |
| download | FreeBSD-src-23574c86734ab5cb088584d30345e698cbbeaef2.zip FreeBSD-src-23574c86734ab5cb088584d30345e698cbbeaef2.tar.gz | |
Remove the now-unused NET_{LOCK,UNLOCK,ASSERT}_GIANT() macros, which
previously conditionally acquired Giant based on debug.mpsafenet. As that
has now been removed, they are no longer required. Removing them
significantly simplifies error-handling in the socket layer, eliminated
quite a bit of unwinding of locking in error cases.
While here clean up the now unneeded opt_net.h, which previously was used
for the NET_WITH_GIANT kernel option. Clean up some related gotos for
consistency.
Reviewed by: bz, csjp
Tested by: kris
Approved by: re (kensmith)
Diffstat (limited to 'sys/compat/linux/linux_socket.c')
| -rw-r--r-- | sys/compat/linux/linux_socket.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 553a657..e6ac278 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -670,7 +670,6 @@ linux_connect(struct thread *td, struct linux_connect_args *args) * socket and use the file descriptor reference instead of * creating a new one. */ - NET_LOCK_GIANT(); error = fgetsock(td, linux_args.s, &so, &fflag); if (error == 0) { error = EISCONN; @@ -683,7 +682,6 @@ linux_connect(struct thread *td, struct linux_connect_args *args) } fputsock(so); } - NET_UNLOCK_GIANT(); return (error); } |
