From nobody Mon Jul 20 20:53:25 2026 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 4h3t5d69yyz6dQ4J for ; Mon, 20 Jul 2026 20:53:25 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h3t5d30Mmz46nk for ; Mon, 20 Jul 2026 20:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784580805; 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=gpoJ1N/fOAVDRVwUXm/KquJhBPT0/DcCpfGVKDQziaU=; b=W7E9y8ElXX81c18NzMyCtU5xFHWORunmx3njCrR/q/qbkV7TfFf9IO+KivgGlHZdHezoW4 fvfWy7UewGU4m7K9vzTpmYIj3lMshF3wamz2aFeDDmeuYautulgdGFBWLayU7/7chTVP85 HKm+z2qJzpAQv1AyrSAwI/rgxFB6BcEs2QywCJyZRdKmsffYxQDNaQPZtWrm070vldkfMF Le0ZL5nc8G8E3698MaViILf2nBNXJIqaoNe8WIfwVqRf+vKp+e2uLC3+mvTWjJnLq3W+dp z/LVuKxW2p17Pk7bKXiBlcn5MQDUus8TqPKbPtHMiPcOI6SSOSbKF3ZyeMpBqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784580805; a=rsa-sha256; cv=none; b=sapf/a8BA+N93DRHla+7Imauvwp0g6i5q5skupboG5Zt3u9UXskpW8xlK780RsD99rwBr/ ieq1yPFaLgYx5cq57Sg5IYFDaaq1uA213NwGQdPXTlFI/smNI2WES/QCz4kNT2dgSKeSz7 b0eD+/lb2o5djH92Q442VnwEE/Fo6qbE415xPbG0GiS+aBOehdY2+9Y789wpbv2rZlgcee C88mBH07D72vwiZJWWYFyfag0A2/xclEsof4kGm7W49Y3RnFYo37AsqPha+ErNByrD2tOx oZfp0ekspPtIIldZ73o46GDTgW81vfoP5AVkHsnu2vv6RqkBhNCUTbjqHz2Pkg== 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=1784580805; 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=gpoJ1N/fOAVDRVwUXm/KquJhBPT0/DcCpfGVKDQziaU=; b=v3Ywpxy2BoaL/cp93KRHcP+eN0egaciBxyj2BSp90n9bAUBC9fpdtsWI1ysyfjJtlldPVy YvOOj7O9o/G1Qz55fkq9HsxVCU+QwaIU3zDkE52o6mIxwoGac0oGLELiCpXy8Tg1VJIjrd UME16Ie1/IIFgOLEQKeULLNuNLNUV0YomX+Af+obLiX/+i9o8FjNNuqL9kKbTLTZrWPOSn ddi0ulx33pYJmWKdaLwl4nqOpsaJftnQB/qu3kbLsyZInpSz5h4VYl7N7gl5+GRgfTA3sR xAGl49QzktjpMGW3K1Ciuwe127jHnI76df/5kyTffR9CD9zjLj47QN9OWNOzgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3t5d1zlvz2kK for ; Mon, 20 Jul 2026 20:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c26b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 20:53:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1712dc691e0a - stable/15 - kern_filewrite(): unconditionally calculate cnt, it is used by callers 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 Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1712dc691e0a24b578aa263edec9b2c99e26c9dc Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 20:53:25 +0000 Message-Id: <6a5e8ac5.1c26b.7ab90d1f@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1712dc691e0a24b578aa263edec9b2c99e26c9dc commit 1712dc691e0a24b578aa263edec9b2c99e26c9dc Author: Konstantin Belousov AuthorDate: 2026-07-08 14:54:25 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-20 20:26:03 +0000 kern_filewrite(): unconditionally calculate cnt, it is used by callers (cherry picked from commit b72397da275b098365532133688d555b842bad4f) --- sys/kern/sys_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 07b98613e087..cfc3b6f88c34 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -595,9 +595,9 @@ kern_filewrite(struct thread *td, int fd, struct file *fp, struct uio *auio, #endif cnt = auio->uio_resid; error = fo_write(fp, auio, td->td_ucred, flags, td); + cnt -= auio->uio_resid; #ifdef KTRACE if (ktruio != NULL) { - cnt -= auio->uio_resid; if (error == 0) ktruio->uio_resid = cnt; ktrgenio(fd, UIO_WRITE, ktruio, error);