[src/trunk]: src/external/mpl/bind/dist/lib/isc/unix Locking protocol changed...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/044b443e4473
branches:  trunk
changeset: 1010690:044b443e4473
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jun 01 18:55:37 2020 +0000

description:
Locking protocol changed; the internal routines are now called with the
socket locked. Adjust for that.

diffstat:

 external/mpl/bind/dist/lib/isc/unix/socket.c |  8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r ccd50a56bc5a -r 044b443e4473 external/mpl/bind/dist/lib/isc/unix/socket.c
--- a/external/mpl/bind/dist/lib/isc/unix/socket.c      Mon Jun 01 14:46:04 2020 +0000
+++ b/external/mpl/bind/dist/lib/isc/unix/socket.c      Mon Jun 01 18:55:37 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: socket.c,v 1.15 2020/05/31 17:45:02 christos Exp $     */
+/*     $NetBSD: socket.c,v 1.16 2020/06/01 18:55:37 christos Exp $     */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -3174,7 +3174,6 @@
 
        INSIST(VALID_SOCKET(sock));
 
-       LOCK(&sock->lock);
        isc_refcount_increment(&sock->references);
        UNLOCK(&sock->lock);
 
@@ -3192,8 +3191,6 @@
        if (more_data)
                select_poke(sock->manager, sock->threadid, sock->fd,
                    SELECT_POKE_WRITE);
-
-       UNLOCK(&sock->lock);
 }
 
 static void
@@ -3203,7 +3200,6 @@
 
        INSIST(VALID_SOCKET(sock));
 
-       LOCK(&sock->lock);
        isc_refcount_increment(&sock->references);
        UNLOCK(&sock->lock);
 
@@ -3221,8 +3217,6 @@
        if (more_data)
                select_poke(sock->manager, sock->threadid, sock->fd,
                    SELECT_POKE_READ);
-
-       UNLOCK(&sock->lock);
 }
 
 /*