The branch main has been updated by glebius:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=f20e8cd5099600bea9c2c517292afe3a05b4cb92

commit f20e8cd5099600bea9c2c517292afe3a05b4cb92
Author:     Gleb Smirnoff <gleb...@freebsd.org>
AuthorDate: 2025-05-28 17:24:57 +0000
Commit:     Gleb Smirnoff <gleb...@freebsd.org>
CommitDate: 2025-05-29 18:44:52 +0000

    sockets: remove dom_externalize
    
    It was used only by unix(4) and now is completely isolated.
---
 sys/kern/uipc_debug.c  |  3 ---
 sys/kern/uipc_socket.c | 13 ++-----------
 sys/kern/uipc_usrreq.c |  1 -
 sys/sys/domain.h       |  2 --
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/sys/kern/uipc_debug.c b/sys/kern/uipc_debug.c
index bbd6c078fd06..df36ec75cb5f 100644
--- a/sys/kern/uipc_debug.c
+++ b/sys/kern/uipc_debug.c
@@ -236,9 +236,6 @@ db_print_domain(struct domain *d, const char *domain_name, 
int indent)
        db_printf("dom_family: %d   ", d->dom_family);
        db_printf("dom_name: %s\n", d->dom_name);
 
-       db_print_indent(indent);
-       db_printf("dom_externalize: %p   ", d->dom_externalize);
-
        db_print_indent(indent);
        db_printf("dom_protosw: %p   ", d->dom_protosw);
        db_printf("dom_next: %p\n", d->dom_next.sle_next);
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index d478b09ca71c..6c9eb7139cd1 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -2934,13 +2934,7 @@ dontblock:
                while (cm != NULL) {
                        cmn = cm->m_next;
                        cm->m_next = NULL;
-                       if (pr->pr_domain->dom_externalize != NULL) {
-                               SOCKBUF_UNLOCK(&so->so_rcv);
-                               VNET_SO_ASSERT(so);
-                               error = (*pr->pr_domain->dom_externalize)
-                                   (cm, controlp, flags);
-                               SOCKBUF_LOCK(&so->so_rcv);
-                       } else if (controlp != NULL)
+                       if (controlp != NULL)
                                *controlp = cm;
                        else
                                m_freem(cm);
@@ -3623,10 +3617,7 @@ soreceive_dgram(struct socket *so, struct sockaddr 
**psa, struct uio *uio,
                while (cm != NULL) {
                        cmn = cm->m_next;
                        cm->m_next = NULL;
-                       if (pr->pr_domain->dom_externalize != NULL) {
-                               error = (*pr->pr_domain->dom_externalize)
-                                   (cm, controlp, flags);
-                       } else if (controlp != NULL)
+                       if (controlp != NULL)
                                *controlp = cm;
                        else
                                m_freem(cm);
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 5b1b8443f8e6..19634e3916da 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -4422,7 +4422,6 @@ static struct protosw seqpacketproto = {
 static struct domain localdomain = {
        .dom_family =           AF_LOCAL,
        .dom_name =             "local",
-       .dom_externalize =      unp_externalize,
        .dom_nprotosw =         3,
        .dom_protosw =          {
                &streamproto,
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index 45180aa06f80..dfdda1bc9491 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -52,8 +52,6 @@ struct domain {
        char    *dom_name;
        int     dom_flags;
        int     (*dom_probe)(void);     /* check for support (optional) */
-       int     (*dom_externalize)      /* externalize access rights */
-               (struct mbuf *, struct mbuf **, int);
        struct rib_head *(*dom_rtattach)        /* initialize routing table */
                (uint32_t);
        void    (*dom_rtdetach)         /* clean up routing table */

Reply via email to