Date: Sat, 24 Jan 2026 00:32:30 +0000 From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: a6cc48e22ba7 - stable/15 - sendfile: remove calculation of unused bsize Message-ID: <6974131e.a239.635415dd@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a6cc48e22ba7357d368ef6f21c3a01b839d412a2 commit a6cc48e22ba7357d368ef6f21c3a01b839d412a2 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2026-01-11 03:51:45 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6974131e.a239.635415dd>