D54713.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D54713.diff
View Options

	diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c
	--- a/sys/kern/kern_sendfile.c
	+++ b/sys/kern/kern_sendfile.c
	@@ -518,8 +518,7 @@

	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;
	@@ -530,7 +529,6 @@
	vp = *vp_res = NULL;
	obj = NULL;
	shmfd = *shmfd_res = NULL;
	- *bsize = 0;

	/*
	* The file descriptor must be a regular file and have a
	@@ -543,7 +541,6 @@
	error = EINVAL;
	goto out;
	}
	- *bsize = vp->v_mount->mnt_stat.f_iosize;
	obj = vp->v_object;
	if (obj == NULL) {
	error = EINVAL;
	@@ -717,7 +714,7 @@
	struct shmfd *shmfd;
	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
	@@ -733,7 +730,7 @@
	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)
	goto out;