Fixed merge errors
Revert "aio.c: Asynchronous I/O latency to a solid-state disk greatly increased"

This reverts commit 65aabe66d74001d7d327bdd565d192c77c656eb2.