Page MenuHomeFreeBSD
Files F109005250

D27726.diff
No OneTemporary
Actions

D27726.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
@@ -413,12 +413,13 @@
*/
static int
sendfile_swapin(vm_object_t obj, struct sf_io *sfio, int *nios, off_t off,
- off_t len, int npages, int rhpages, int flags)
+ off_t len, int rhpages, int flags)
{
vm_page_t *pa;
- int a, count, count1, grabbed, i, j, rv;
+ int a, count, count1, grabbed, i, j, npages, rv;
pa = sfio->pa;
+ npages = sfio->npages;
*nios = 0;
flags = (flags & SF_NODISKIO) ? VM_ALLOC_NOWAIT : 0;
sfio->pindex0 = OFF_TO_IDX(off);
@@ -905,6 +906,7 @@
sfio->obj = obj;
sfio->error = 0;
sfio->m = NULL;
+ sfio->npages = npages;
#ifdef KERN_TLS
/*
* This doesn't use ktls_hold() because sfio->m will
@@ -914,8 +916,8 @@
sfio->tls = tls;
#endif
vm_object_pip_add(obj, 1);
- error = sendfile_swapin(obj, sfio, &nios, off, space, npages,
- rhpages, flags);
+ error = sendfile_swapin(obj, sfio, &nios, off, space, rhpages,
+ flags);
if (error != 0) {
if (vp != NULL)
VOP_UNLOCK(vp);
@@ -963,7 +965,7 @@
if (pa[i] == NULL) {
SFSTAT_INC(sf_busy);
fixspace(npages, i, off, &space);
- npages = i;
+ sfio->npages = i;
softerr = EBUSY;
break;
}
@@ -1042,12 +1044,14 @@
if (sf == NULL) {
SFSTAT_INC(sf_allocfail);
sendfile_iowait(sfio, "sfnosf");
- for (int j = i; j < npages; j++)
+ for (int j = i; j < npages; j++) {
vm_page_unwire(pa[j], PQ_INACTIVE);
+ pa[j] = NULL;
+ }
if (m == NULL)
softerr = ENOBUFS;
fixspace(npages, i, off, &space);
- npages = i;
+ sfio->npages = i;
break;
}
@@ -1152,7 +1156,6 @@
} else {
sfio->so = so;
sfio->m = m0;
- sfio->npages = npages;
soref(so);
error = (*so->so_proto->pr_usrreqs->pru_send)
(so, PRUS_NOTREADY, m, NULL, NULL, td);

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 31, 1:17 PM (15 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16363842
Default Alt Text
D27726.diff (1 KB)

Event Timeline