Merge branch 'raimo/64-bit-efile_drv/OTP-9820' into maint

* raimo/64-bit-efile_drv/OTP-9820:
  file_SUITE: Assume 64-bit windows has enough memory
  erts: Badarg if port output overflows iov_len
  prim_file_SUITE: large_file success depends on wordsize
  file_SUITE: Increase timeout for large_file
  file_SITE,prim_file_SUITE: Accept old OpenBSD pecularity
  prim_file_SUITE: large_write - meaner test data and check result content
  file_SUITE: large_write - check mem size before creating huge binary
  erts: rewrite efile_writev to handle partial writes correctly
  erts: Bugfix - driver_deq freed wrong length due to short type (int)
  prim_file_SUITE: Add large_write/1
  file_SUITE: Add large_write/1
  file_SUITE: Refactor large_file/1
  file_SUITE: Fix unix_free/1

1 files changed, 6 insertions, 2 deletions

diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index b132991a3b..36ed108b76 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -1385,7 +1385,11 @@ static void invoke_writev(void *data) {
 	size = d->c.writev.size;
     }
 
-    /* Copy the io vector to avoid locking the port que while writing */
+    /* Copy the io vector to avoid locking the port que while writing,
+     * also, both we and efile_writev might/will change the SysIOVec
+     * when segmenting or due to partial write and we do not want to
+     * tamper with the actual queue that we get from driver_peekq
+     */
     MUTEX_LOCK(d->c.writev.q_mtx); /* Lock before accessing the port queue */
     iov0 = driver_peekq(d->c.writev.port, &iovlen);
 
@@ -1424,7 +1428,7 @@ static void invoke_writev(void *data) {
 	} else {
 	    d->result_ok = efile_writev(&d->errInfo, 
 					d->flags, (int) d->fd,
-					iov, iovcnt, size);
+					iov, iovcnt);
 	}
     } else if (iovlen == 0) {
 	d->result_ok = 1;