From nobody Fri Jul 25 21:13:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bpgbB3XVXz62Ljp; Fri, 25 Jul 2025 21:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bpgbB0Hb0z3Cfg; Fri, 25 Jul 2025 21:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753478022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=acz6PfTFnX7utdF9kH7IR8oZhE6xMOqc0dKEcMMNrt8=; b=L8MVpkjjuNt+6VrA/JjTG6gtB8E0gx1rdzwaiyk6wOOMdVTtGoC2D4i3shvCCH2h/6jL0c BHx3HG8hwlY/dLKjZe78+MAxqWEmdsmMDD3qzP7ZkPtX+YmVHxHNPlB+7oTKYW5uiVu+ag a846yUlcl67iu5qiw2nqNvdxqnvBs0zF3L53PKYA/sx+cNJZFsQRj7fMULuBCzo34e85zs c9voptLJKEmFTyy3dnGJFnXLVOwhChS8YyY/ASUkSCRaiXOP7E+SHg+B+M3bELXtsccdJ+ yAooq3v30/W+il+XzxaUxr024vsphyW6HV8rnNxKX/4meoxncaNsqXZG2dWlJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753478022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=acz6PfTFnX7utdF9kH7IR8oZhE6xMOqc0dKEcMMNrt8=; b=yu2SWWzxqNNajsnu/LJU0lchAPu1/KZnOZLcndJUoHW9mig0gS6ndSUrF+e1hQycsxmGbJ +Pcmx8el+QXe8ML0WEqyiVHZbFclXcj+IY8M+QlrD/KYolcWD3LEjXLMP0joOoaboAUf1b pgsfYl6IcDIffa2Z02GPvpYH7nfQG0mtoxvAtLIQRp+KInvNbkcoEUO5/5DYkpLBSjFIZY pRPSw+wZ7/HbNgJmSXxbC41mK5oyfCLJ2ifdJtF2hVVMlBWxu2TpaMtYzFmBuxaoyfcp3L NXHbQ1zL4XFYTDsVmfDZmj0fClEvVhLpcg7aIofs+mUr40BzTA3OONQJCMWarA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753478022; a=rsa-sha256; cv=none; b=u0Q/5oEQ5UiAsl5QUowkFlv7aSRHZlFqdpvr6UKfHcnpwOIVNS/dGaHV2Ia0qasIqnUAt6 p5sG1Ea7ix12LyXiHLKepwfVDYzyF0Em+9gNt8+z637L5uvSkQSv/ZtwS4tlGDToXsfcmV R8F2cU1lMYfoKmtlnH4OtcINVCEvv0M3GqzFUGY+f7lUsZFWZbpc02F0Qbu4F6gPzdwJzB OaOUi9Q4uWHGdCkR8k+1YJTBA7gEvGOeKskDmZftQ4EWUajbJsXo7YGPG6BQeO/Yx83tr+ j8Zp5ap6mYQindk+7E3tbt1Nx3TaIq1jkX2IYAMu4dFmJ1PutSv27dV1bi2y4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bpgb970Lxz10kr; Fri, 25 Jul 2025 21:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56PLDfuJ025674; Fri, 25 Jul 2025 21:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56PLDfvj025671; Fri, 25 Jul 2025 21:13:41 GMT (envelope-from git) Date: Fri, 25 Jul 2025 21:13:41 GMT Message-Id: <202507252113.56PLDfvj025671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 26188470cff6 - main - socket: Chase a lingering reference to M_NOTAVAIL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26188470cff6ec436c8d5dd570539c38eea20e5d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26188470cff6ec436c8d5dd570539c38eea20e5d commit 26188470cff6ec436c8d5dd570539c38eea20e5d Author: Mark Johnston AuthorDate: 2025-07-25 21:00:53 +0000 Commit: Mark Johnston 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.