From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWH8-0004cX-J9 for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:55:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvWH6-00078m-VN for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:55:42 -0500 Sender: fluxion From: Michael Roth Date: Wed, 16 Jan 2013 10:49:23 -0600 Message-Id: <1358354963-9070-22-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1358354963-9070-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1358354963-9070-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 21/21] raw-posix: fix bdrv_aio_ioctl List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, qemu-stable@nongnu.org From: Paolo Bonzini When the raw-posix aio=thread code was moved from posix-aio-compat.c to block/raw-posix.c, there was an unintended change to the ioctl code. The code used to return the ioctl command, which posix_aio_read() would later morph into a zero. This hack is not necessary anymore, and in fact breaks scsi-generic (which expects a zero return code). Remove it. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf (cherry picked from commit b608c8dc02c78ee95455a0989bdf1b41c768b2ef) Signed-off-by: Michael Roth --- block/raw-posix.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 550c81f..5c6c564 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -456,15 +456,7 @@ static ssize_t handle_aiocb_ioctl(RawPosixAIOData *aiocb) return -errno; } - /* - * This looks weird, but the aio code only considers a request - * successful if it has written the full number of bytes. - * - * Now we overload aio_nbytes as aio_ioctl_cmd for the ioctl command, - * so in fact we return the ioctl command here to make posix_aio_read() - * happy.. - */ - return aiocb->aio_nbytes; + return 0; } static ssize_t handle_aiocb_flush(RawPosixAIOData *aiocb) -- 1.7.9.5