diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-06-04 14:41:11 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-06-04 14:41:11 +0200 |
| commit | 57b24ccd49fc005d685aeebd363531a8ed86e6bc (patch) | |
| tree | cccfa608d4aa543a60151352fbdbec01760b2c42 /erts/emulator | |
| parent | e83fd8f94aba352b6cc055d2b4cfff007911b6d4 (diff) | |
| parent | 66c5325d80aaee54bda10ff0ebb4c79a4fea24d0 (diff) | |
| download | otp-57b24ccd49fc005d685aeebd363531a8ed86e6bc.tar.gz otp-57b24ccd49fc005d685aeebd363531a8ed86e6bc.tar.bz2 otp-57b24ccd49fc005d685aeebd363531a8ed86e6bc.zip | |
Merge branch 'maint'
Conflicts:
bootstrap/lib/stdlib/ebin/erl_pp.beam
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/drivers/common/efile_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c index 6cc1295973..595b0488a8 100644 --- a/erts/emulator/drivers/common/efile_drv.c +++ b/erts/emulator/drivers/common/efile_drv.c @@ -1679,10 +1679,10 @@ static void invoke_pwritev(void *data) { d->again = 0; } } else - ASSERT(written == FILE_SEGMENT_WRITE); + ASSERT(written >= FILE_SEGMENT_WRITE); MUTEX_LOCK(d->c.writev.q_mtx); - driver_deq(d->c.pwritev.port, size); + driver_deq(d->c.pwritev.port, written); MUTEX_UNLOCK(d->c.writev.q_mtx); done: EF_FREE(iov); /* Free our copy of the vector, nothing to restore */ |