diff options
| author | ngie <ngie@FreeBSD.org> | 2015-10-05 00:11:49 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-10-05 00:11:49 +0000 |
| commit | e3bac3a30a41f56ac36f4791a7df260f2155c8db (patch) | |
| tree | ac20948d4aa368300bc16ece67336a1bed25e992 /sys/kern | |
| parent | ca6cf0ba737487849f2ee102afce74545600850c (diff) | |
| parent | 85fa330dc74592563cea8d7cf0e628fd30683993 (diff) | |
| download | FreeBSD-src-e3bac3a30a41f56ac36f4791a7df260f2155c8db.zip FreeBSD-src-e3bac3a30a41f56ac36f4791a7df260f2155c8db.tar.gz | |
MFhead @ r281414
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_sbuf.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_bio.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c index 3c36b28..5314590 100644 --- a/sys/kern/subr_sbuf.c +++ b/sys/kern/subr_sbuf.c @@ -623,6 +623,10 @@ sbuf_vprintf(struct sbuf *s, const char *fmt, va_list ap) va_copy(ap_copy, ap); len = vsnprintf(&s->s_buf[s->s_len], SBUF_FREESPACE(s) + 1, fmt, ap_copy); + if (len < 0) { + s->s_error = errno; + return (-1); + } va_end(ap_copy); if (SBUF_FREESPACE(s) >= len) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 0fab000..70dc565 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -2050,11 +2050,10 @@ vfs_vmio_iodone(struct buf *bp) (intmax_t)foff, (uintmax_t)m->pindex)); vm_page_sunbusy(m); - vm_object_pip_subtract(obj, 1); foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; iosize -= resid; } - vm_object_pip_wakeupn(obj, 0); + vm_object_pip_wakeupn(obj, bp->b_npages); VM_OBJECT_WUNLOCK(obj); if (bogus && buf_mapped(bp)) { BUF_CHECK_MAPPED(bp); @@ -3923,10 +3922,9 @@ vfs_unbusy_pages(struct buf *bp) } else BUF_CHECK_UNMAPPED(bp); } - vm_object_pip_subtract(obj, 1); vm_page_sunbusy(m); } - vm_object_pip_wakeupn(obj, 0); + vm_object_pip_wakeupn(obj, bp->b_npages); VM_OBJECT_WUNLOCK(obj); } |
