From nobody Sun Apr 14 17:21:43 2024 X-Original-To: dev-commits-src-all@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 4VHcY374VFz5Gy00; Sun, 14 Apr 2024 17:21:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VHcY35Cgkz4W3s; Sun, 14 Apr 2024 17:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713115303; 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=MvgZmqWuZLbsustzBiwdCDrhItNt/nQDhCGYk9wlL7k=; b=RvaXot4mK6copdF6efjg7UnHRDw+pNuJ1cPU10FpF1y7j7Y6DYp0MhCzA+/F6t0qavcAKY SSoFZ/yO5oAJieDjL0oG9G455CM4XP98UD2QcYE5t7k7D292JLySaB81cmfhnmwvOvaXN+ DCo+v7jKYjfh2VKn8AtTJTp0LUtWS6RSV6Qp/7s4QvDDG8+7Vs78tuBcsGLJO33mwBxrVP dX4CW6GDAVoeJRe+UoI1YX6PNMKqtZ3+6O5M283NOAUbapzFg8DRPi2N+4BKPfOjPlCQJv a9ulTAyQqRwnrrMdZgzgc/P56rVJSHpeBTAFV6r+CCvT+sG1v9FMAI0oXUDgAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713115303; a=rsa-sha256; cv=none; b=JI93VPmmFatU+MWtO03mnJaxFILf5UumHVRw0Hdk3NRxrlSWSJvg+KQ0ujJqi/hZr51RH/ o4zVa9b8Afd5RqJEDS80YFz0pzxxoObrmeejvfdUHaCk8DNVmfQHLpby4fQ6DwCTJRdqmR TtXUMOepmBmrEpJei/msGglFUUScdfezg7e5pvpMLuzvT06oaykHA6Q9+0KBzO/gmNiTuM WNNLBFEsZ+ICPmHGh+0a5EiVnrDCln+mgr4ThkuPx4zmfiVEdxwHsiLi2s6QogKSLsmnna qm+XgaesEbf7vrOniym1v3MjZmkT6jQVmyb8cnY7BkQECnIjc49OLXKtudNqNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713115303; 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=MvgZmqWuZLbsustzBiwdCDrhItNt/nQDhCGYk9wlL7k=; b=SLmjIWqoy6eRrzq1MsDKOUHqi+WVhSOjO9RIOyOct8H+3ksCnegyVSB2MP77lwXkaeMjn/ md1G+qS43t1hfvPrhLDt1nP+96CZMex7FaoD/kBA7um+jJI3rjZ9fGFKyA0k9L3Rjzswea L3bd+2JmO25UHTm5crsO84V6qbUba6bayAyV9B8CugPhgjeWB0+h5vk+wwyrP++ys2WTAm HTuxrVf0ReiuV7WbPoBpGx0ND4z1eIoO6a+Hgpz3xgI9gkw9k8gkUP2B8WCUMNUbU1RNGI Q3OiztyygfCXoWCk0oDyE+1JaJ2h3u1rlkylXW53Ucs/TFbgnY9XVLYZugP75Q== 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 4VHcY34pBBzPc8; Sun, 14 Apr 2024 17:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43EHLhsM064598; Sun, 14 Apr 2024 17:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43EHLhqV064595; Sun, 14 Apr 2024 17:21:43 GMT (envelope-from git) Date: Sun, 14 Apr 2024 17:21:43 GMT Message-Id: <202404141721.43EHLhqV064595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e6a4b57239da - main - mbuf: restore m_uiotombuf() feature of returning a zero length mbuf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6a4b57239dafc6c944473326891d46d966c0264 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e6a4b57239dafc6c944473326891d46d966c0264 commit e6a4b57239dafc6c944473326891d46d966c0264 Author: Gleb Smirnoff AuthorDate: 2024-04-14 17:21:07 +0000 Commit: Gleb Smirnoff CommitDate: 2024-04-14 17:21:07 +0000 mbuf: restore m_uiotombuf() feature of returning a zero length mbuf PR: 278340 Fixes: aba79b0f4a3f69f070ace6effd5700d65226bd20 --- sys/kern/uipc_mbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index f5f6db752883..d3389aeeccaf 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1948,7 +1948,7 @@ m_uiotombuf(struct uio *uio, int how, int len, int lspace, int flags) if (flags & M_EXTPG) { /* XXX: 'lspace' magically becomes maxseg! */ return (m_uiotombuf_nomap(uio, how, len, lspace, flags)); - } else if (__predict_false(uio->uio_resid + len == 0)) { + } else if (__predict_false(uio->uio_resid == 0)) { struct mbuf *m; /*