From patchwork Mon Jan 14 06:01:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Yuan X-Patchwork-Id: 211707 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 85A082C00B3 for ; Mon, 14 Jan 2013 17:02:28 +1100 (EST) Received: from localhost ([::1]:54406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tud7q-00077j-PZ for incoming@patchwork.ozlabs.org; Mon, 14 Jan 2013 01:02:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tud7G-0006K1-Ph for qemu-devel@nongnu.org; Mon, 14 Jan 2013 01:02:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tud6y-00086G-5G for qemu-devel@nongnu.org; Mon, 14 Jan 2013 01:01:50 -0500 Received: from mail-pb0-f52.google.com ([209.85.160.52]:37469) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tud6x-000866-TJ for qemu-devel@nongnu.org; Mon, 14 Jan 2013 01:01:32 -0500 Received: by mail-pb0-f52.google.com with SMTP id ro2so1961278pbb.25 for ; Sun, 13 Jan 2013 22:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=oRQBoRhi39ModssauiPe5Q2x/2KPhh/kycdxztxM7uk=; b=OxuJgCVY58RHIUXZL16QYdZYWe55KfJgdC9nrxHf28RUoTjiniqym7ig77nA9mnZgJ wkKyGHgMhf8dywbOLEYCN1aywr1CgUavndiwJFbk+Cb0rbyOGSbM78kJUR187S9XRGRZ NxB6ia/aQlYM4Xi09D4lF0YbA9DYcdZH1ZC6YaLGPuKsRECVaNIw8DpaRUZH+RjfOz6z iQy8wzCuyV6js7BuF+W8whIU3ipIwKmI67WZ7/HJCqz/UtvQex+VItiRhTPDuvZtV6QG QbYeKNDxOS7Uf//4/LDCowrsmh/y/CGzJI0DYD0R6NSen+m5BX+paORGSVwb+Rm/0cXd c51g== X-Received: by 10.66.88.164 with SMTP id bh4mr87738323pab.41.1358143291105; Sun, 13 Jan 2013 22:01:31 -0800 (PST) Received: from K55VM-ubuntu.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPS id z10sm8106015pax.38.2013.01.13.22.01.25 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 13 Jan 2013 22:01:30 -0800 (PST) From: Liu Yuan To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2013 14:01:03 +0800 Message-Id: <1358143263-14565-2-git-send-email-namei.unix@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358143263-14565-1-git-send-email-namei.unix@gmail.com> References: <1358143263-14565-1-git-send-email-namei.unix@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.52 Cc: Kevin Wolf , Stefan Hajnoczi , MORITA Kazutaka Subject: [Qemu-devel] [PATCH 2/2] sheepdog: clean up sd_aio_setup() 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: Liu Yuan The last two parameters of sd_aio_setup() are never used, so remove them. Cc: MORITA Kazutaka Cc: Kevin Wolf Cc: Stefan Hajnoczi Signed-off-by: Liu Yuan --- block/sheepdog.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 4e38670..db33f58 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -427,12 +427,11 @@ static const AIOCBInfo sd_aiocb_info = { }; static SheepdogAIOCB *sd_aio_setup(BlockDriverState *bs, QEMUIOVector *qiov, - int64_t sector_num, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + int64_t sector_num, int nb_sectors) { SheepdogAIOCB *acb; - acb = qemu_aio_get(&sd_aiocb_info, bs, cb, opaque); + acb = qemu_aio_get(&sd_aiocb_info, bs, NULL, NULL); acb->qiov = qiov; @@ -1670,7 +1669,7 @@ static coroutine_fn int sd_co_writev(BlockDriverState *bs, int64_t sector_num, bs->total_sectors = sector_num + nb_sectors; } - acb = sd_aio_setup(bs, qiov, sector_num, nb_sectors, NULL, NULL); + acb = sd_aio_setup(bs, qiov, sector_num, nb_sectors); acb->aio_done_func = sd_write_done; acb->aiocb_type = AIOCB_WRITE_UDATA; @@ -1691,7 +1690,7 @@ static coroutine_fn int sd_co_readv(BlockDriverState *bs, int64_t sector_num, SheepdogAIOCB *acb; int ret; - acb = sd_aio_setup(bs, qiov, sector_num, nb_sectors, NULL, NULL); + acb = sd_aio_setup(bs, qiov, sector_num, nb_sectors); acb->aiocb_type = AIOCB_READ_UDATA; acb->aio_done_func = sd_finish_aiocb; @@ -1717,7 +1716,7 @@ static int coroutine_fn sd_co_flush_to_disk(BlockDriverState *bs) return 0; } - acb = sd_aio_setup(bs, NULL, 0, 0, NULL, NULL); + acb = sd_aio_setup(bs, NULL, 0, 0); acb->aiocb_type = AIOCB_FLUSH_CACHE; acb->aio_done_func = sd_finish_aiocb;