svn commit: r326290 - head/usr.sbin/diskinfo
Alan Somers
asomers at FreeBSD.org
Mon Nov 27 21:10:51 UTC 2017
Author: asomers
Date: Mon Nov 27 21:10:50 2017
New Revision: 326290
URL: https://svnweb.freebsd.org/changeset/base/326290
Log:
diskinfo(8): Delete dead code in slog test
Reported by: Coverity
CID: 1377556
Reviewed by: mav
MFC after: 3 weeks
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D13275
Modified:
head/usr.sbin/diskinfo/diskinfo.c
Modified: head/usr.sbin/diskinfo/diskinfo.c
==============================================================================
--- head/usr.sbin/diskinfo/diskinfo.c Mon Nov 27 20:01:58 2017 (r326289)
+++ head/usr.sbin/diskinfo/diskinfo.c Mon Nov 27 21:10:50 2017 (r326290)
@@ -646,22 +646,22 @@ parwrite(int fd, size_t size, off_t off)
{
struct aiocb aios[MAXIOS];
off_t o;
- size_t s;
int n, error;
struct aiocb *aiop;
- for (n = 0, o = 0; size > MAXIO; n++, size -= s, o += s) {
- s = (size >= MAXIO) ? MAXIO : size;
+ // if size > MAXIO, use AIO to write n - 1 pieces in parallel
+ for (n = 0, o = 0; size > MAXIO; n++, size -= MAXIO, o += MAXIO) {
aiop = &aios[n];
bzero(aiop, sizeof(*aiop));
aiop->aio_buf = &buf[o];
aiop->aio_fildes = fd;
aiop->aio_offset = off + o;
- aiop->aio_nbytes = s;
+ aiop->aio_nbytes = MAXIO;
error = aio_write(aiop);
if (error != 0)
err(EX_IOERR, "AIO write submit error");
}
+ // Use synchronous writes for the runt of size <= MAXIO
error = pwrite(fd, &buf[o], size, off + o);
if (error < 0)
err(EX_IOERR, "Sync write error");
More information about the svn-src-head
mailing list