From nobody Sat Jan 24 00:32:30 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 4dybNZ5YRPz6Q1F1 for ; Sat, 24 Jan 2026 00:32:30 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNZ2BFzz454p for ; Sat, 24 Jan 2026 00:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214750; 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=/WgFngxipJLZgjFOqD3zOXXGTW/K85AgdxhgDUW56qI=; b=CmZ8/OMku560+18AyE5/OTgP3JaXMe/xfN47NhwrDsee+6eQ7oWbJ+6f+qhhFYBcMJYuSy 2ScRx9/J2f5C6rv1UgZgce+rhmpWovEuJOpxVPw/AlOcX4/jHXCcx+Gum7z+fhS1B0dE0u 6R4EwJLjEA9TIqn9O+xwE4vCgcMcHSXOGogDpocYq207twH8m5hr+TrISOZ+aAX7kdq5BR G6MBiQKCdQ89wVCJ5WYGNZNRx+9mEowqVE7qfQDFqj1gP2hIs5Zo4NG2/u2lndGxC8vlCE TX9BGgE1YVjpfw0MRbUEHHXWoLLwCc+GsHbMyaRM0lyUC/Ubwm7K+3WADAYtaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214750; 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=/WgFngxipJLZgjFOqD3zOXXGTW/K85AgdxhgDUW56qI=; b=Ucrc/yzFELGcJHOxAuYHmZAO2MisAqaxO8w3zepYEpuj+WhlBxpiCRzn5t4eQ7KEU2mgGk WZzUxL1C4cne3I0ClFhoLf2PYTvSnBdcyPYa3tzGRJQ2SzRF7zYjhAtv6CxFDEsEocZkN7 9wpjwm6OPamDrvDIvmJIqbixWXBXRZtVtQVvsVt6oGgBYSFxrL4iF7drLIYRw33FfKLuOl oYPpa+zOtUklzQjDhj4hz98IsDzwd0TY5pBxm+71tiqFqPKFuwoQ7jPS0PZhoVnV4dUKUl AH283Qv1w3fCgKAfNeq8gny6feJ9Xs3EViUPa12M+pT1VDbP/bB+T4qKYJCu/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214750; a=rsa-sha256; cv=none; b=vZJ11gasfEq0fztp2Ml+49m5zb0rJ0vnKWOu7k04piAt6TulqV+bS6DbaIOguCfST9vkci IeDKIxwCbMip/CMKp3tiENXahw+MnoysqFg6wQG0qgVPkfIyEsNtIOWSEuiBHaNZm2PlDI 8EXo5IFPLNC+oFfi4DNeNqWGd3ebR+b912A0a18Z+laaM5ZG5sfme5adOEpJn/gR2zp5YP 8Qx2xqMJJLrCVBCgjMKGFaS+ZDklgO9rrA/aMVQbwqExbMeUHp7BxmwnXIoPG31+ian3va EJGIw2BSbnkxgps3Egb9dCXL3+Wc4ODf1UzvnLOqRVCVhcw9Gh+cCjBkXtCguw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNZ1cFxzjNW for ; Sat, 24 Jan 2026 00:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a239 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a6cc48e22ba7 - stable/15 - sendfile: remove calculation of unused bsize 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 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: a6cc48e22ba7357d368ef6f21c3a01b839d412a2 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:30 +0000 Message-Id: <6974131e.a239.635415dd@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a6cc48e22ba7357d368ef6f21c3a01b839d412a2 commit a6cc48e22ba7357d368ef6f21c3a01b839d412a2 Author: Konstantin Belousov AuthorDate: 2026-01-11 03:51:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 sendfile: remove calculation of unused bsize (cherry picked from commit 3fe275c1ef45d452d1adc537b7ec1ca6444739ba) --- sys/kern/kern_sendfile.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index 8438298afc0e..588bdea229e0 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -566,8 +566,7 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, int *nios, off_t off, static int sendfile_getobj(struct thread *td, struct file *fp, vm_object_t *obj_res, - struct vnode **vp_res, struct shmfd **shmfd_res, off_t *obj_size, - int *bsize) + struct vnode **vp_res, struct shmfd **shmfd_res, off_t *obj_size) { vm_object_t obj; struct vnode *vp; @@ -578,7 +577,6 @@ sendfile_getobj(struct thread *td, struct file *fp, vm_object_t *obj_res, vp = *vp_res = NULL; obj = NULL; shmfd = *shmfd_res = NULL; - *bsize = 0; /* * The file descriptor must be a regular file and have a @@ -591,7 +589,6 @@ sendfile_getobj(struct thread *td, struct file *fp, vm_object_t *obj_res, error = EINVAL; goto out; } - *bsize = vp->v_mount->mnt_stat.f_iosize; obj = vp->v_object; if (obj == NULL) { error = EINVAL; @@ -766,7 +763,7 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, struct sendfile_sync *sfs; struct vattr va; off_t off, sbytes, rem, obj_size, nobj_size; - int bsize, error, ext_pgs_idx, hdrlen, max_pgs, softerr; + int error, ext_pgs_idx, hdrlen, max_pgs, softerr; #ifdef KERN_TLS int tls_enq_cnt; #endif @@ -783,7 +780,7 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, softerr = 0; use_ext_pgs = false; - error = sendfile_getobj(td, fp, &obj, &vp, &shmfd, &obj_size, &bsize); + error = sendfile_getobj(td, fp, &obj, &vp, &shmfd, &obj_size); if (error != 0) return (error);