From patchwork Mon Jan 14 10:01:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 211742 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D1BD12C009F for ; Mon, 14 Jan 2013 21:03:36 +1100 (EST) Received: from localhost ([::1]:35341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TugtC-0008Ch-Px for incoming@patchwork.ozlabs.org; Mon, 14 Jan 2013 05:03:34 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tugrv-00052V-0x for qemu-devel@nongnu.org; Mon, 14 Jan 2013 05:02:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tugrs-0006i9-Iu for qemu-devel@nongnu.org; Mon, 14 Jan 2013 05:02:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tugrs-0006hp-Bf for qemu-devel@nongnu.org; Mon, 14 Jan 2013 05:02:12 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0EA2AYI006271 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 14 Jan 2013 05:02:11 -0500 Received: from dhcp-5-188.str.redhat.com (dhcp-200-232.str.redhat.com [10.33.200.232]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0EA21Un000748; Mon, 14 Jan 2013 05:02:10 -0500 From: Kevin Wolf To: anthony@codemonkey.ws Date: Mon, 14 Jan 2013 11:01:58 +0100 Message-Id: <1358157721-4131-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1358157721-4131-1-git-send-email-kwolf@redhat.com> References: <1358157721-4131-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 3/6] raw-posix: fix bdrv_aio_ioctl X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 --- block/raw-posix.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 87d888e..0e705ba 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -455,15 +455,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)