diff options
| author | mdf <mdf@FreeBSD.org> | 2010-09-13 18:48:23 +0000 |
|---|---|---|
| committer | mdf <mdf@FreeBSD.org> | 2010-09-13 18:48:23 +0000 |
| commit | 3ed6eac561ccce2958e668867ea38fd005bc635b (patch) | |
| tree | b0bd953f5f99c28abddea5f8c7bb39d837607940 /sys/kern/subr_sbuf.c | |
| parent | 9a10f7c4328c6763a33844ed9635ef3c2a7f1e84 (diff) | |
| download | FreeBSD-src-3ed6eac561ccce2958e668867ea38fd005bc635b.zip FreeBSD-src-3ed6eac561ccce2958e668867ea38fd005bc635b.tar.gz | |
Revert r212370, as it causes a LOR on powerpc. powerpc does a few
unexpected things in copyout(9) and so wiring the user buffer is not
sufficient to perform a copyout(9) while holding a random mutex.
Requested by: nwhitehorn
Diffstat (limited to 'sys/kern/subr_sbuf.c')
| -rw-r--r-- | sys/kern/subr_sbuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c index 0d083b4..e81faa5 100644 --- a/sys/kern/subr_sbuf.c +++ b/sys/kern/subr_sbuf.c @@ -303,8 +303,8 @@ sbuf_drain(struct sbuf *s) s->s_error = -len; return (s->s_error); } - KASSERT(len > 0 && len <= s->s_len, - ("Bad drain amount %d for sbuf %p", len, s)); + + KASSERT(len > 0, ("Drain must either error or work!")); s->s_len -= len; /* * Fast path for the expected case where all the data was |
