From patchwork Wed Jan 16 16:49:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 212825 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 2B3862C0085 for ; Thu, 17 Jan 2013 03:56:40 +1100 (EST) Received: from localhost ([::1]:56768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWI2-0005Va-Dc for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 11:56:38 -0500 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 Received: from mail-ie0-f175.google.com ([209.85.223.175]:56245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWH6-00078d-RJ; Wed, 16 Jan 2013 11:55:40 -0500 Received: by mail-ie0-f175.google.com with SMTP id qd14so2932533ieb.34 for ; Wed, 16 Jan 2013 08:55:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=dUdzSxzNPqL2XLUZKBVp8SvR+MjzS7VT+qmKnV0hSz8=; b=Y4wd1jVLYK5iU3IOHYfPZTmhdY/t5Kabu5EudRWM/zg3jWU4sdiZagCOB72B5F6wZQ WHB8YB04Z5B4Xbvwk8fLqxCYxKh0WoAliOvQUA2/oDtGiRVzsfFn0n5ZP2OEfeckobWd PPiCMOHaI+OAkJJZ7CvOJCd8nG03yG+bIaaFltdKgtCKDezAtheX1xjD2QNX7ftMDhIs 4ZJCl52CKXEDUvpiDhwK/djMc1NrUp3t2PNGlIram0Jn7IocWi70cpgqpJXR8Jn1lLQ9 A9072x5F8v2WJePvcU8t1EpSo8lzq7zTrK7zYq33EMwoe0IVUokZa5dyg9T3Kv1ZFa/Q s6GA== X-Received: by 10.50.36.134 with SMTP id q6mr1234993igj.98.1358355340207; Wed, 16 Jan 2013 08:55:40 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id ez8sm5148473igb.17.2013.01.16.08.55.39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 16 Jan 2013 08:55:39 -0800 (PST) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 10:49:23 -0600 Message-Id: <1358354963-9070-22-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.175 Cc: aliguori@us.ibm.com, qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 21/21] 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 (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)