release does an splx(s); don't bother doing it earlier

SCCS-vsn: sys/kern/uipc_socket.c 7.6

diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index 833da9a..8c0e7cc 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)uipc_socket.c       7.5 (Berkeley) %G%
+ *     @(#)uipc_socket.c       7.6 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -437,25 +437,25 @@ restart:
        sblock(&so->so_rcv);
        s = splnet();
 
        sblock(&so->so_rcv);
        s = splnet();
 

-#define        rcverr(errno)   { error = errno; splx(s); goto release; }

        if (so->so_rcv.sb_cc == 0) {
                if (so->so_error) {
                        error = so->so_error;
                        so->so_error = 0;
        if (so->so_rcv.sb_cc == 0) {
                if (so->so_error) {
                        error = so->so_error;
                        so->so_error = 0;

-                       splx(s);

                        goto release;
                }
                        goto release;
                }

-               if (so->so_state & SS_CANTRCVMORE) {
-                       splx(s);
+               if (so->so_state & SS_CANTRCVMORE)

                        goto release;
                        goto release;

-               }

                if ((so->so_state & SS_ISCONNECTED) == 0 &&
                if ((so->so_state & SS_ISCONNECTED) == 0 &&

-                   (so->so_proto->pr_flags & PR_CONNREQUIRED))
-                       rcverr(ENOTCONN);
+                   (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
+                       error = ENOTCONN;
+                       goto release;
+               }

                if (uio->uio_resid == 0)
                        goto release;
                if (uio->uio_resid == 0)
                        goto release;

-               if (so->so_state & SS_NBIO)
-                       rcverr(EWOULDBLOCK);
+               if (so->so_state & SS_NBIO) {
+                       error = EWOULDBLOCK;
+                       goto release;
+               }

                sbunlock(&so->so_rcv);
                sbwait(&so->so_rcv);
                splx(s);
                sbunlock(&so->so_rcv);
                sbwait(&so->so_rcv);
                splx(s);