Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Jul 2025 21:13:41 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 26188470cff6 - main - socket: Chase a lingering reference to M_NOTAVAIL
Message-ID:  <202507252113.56PLDfvj025671@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj:

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

commit 26188470cff6ec436c8d5dd570539c38eea20e5d
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-07-25 21:00:53 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-07-25 21:00:53 +0000

    socket: Chase a lingering reference to M_NOTAVAIL
    
    Fixes:   b93e930ca233 ("sendfile: retire M_BLOCKED")
---
 sys/kern/uipc_socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 17b456deb71f..fe2d8d056062 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -2989,8 +2989,8 @@ dontblock:
 	 */
 	moff = 0;
 	offset = 0;
-	while (m != NULL && !(m->m_flags & M_NOTAVAIL) && uio->uio_resid > 0
-	    && error == 0) {
+	while (m != NULL && !(m->m_flags & M_NOTREADY) && uio->uio_resid > 0 &&
+	    error == 0) {
 		/*
 		 * If the type of mbuf has changed since the last mbuf
 		 * examined ('type'), end the receive operation.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202507252113.56PLDfvj025671>