From patchwork Mon Apr 22 12:19:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Yuan X-Patchwork-Id: 238502 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 165F42C0123 for ; Mon, 22 Apr 2013 22:32:55 +1000 (EST) Received: from localhost ([::1]:40388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUFvQ-0003qN-UW for incoming@patchwork.ozlabs.org; Mon, 22 Apr 2013 08:32:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUFun-0003h5-2j for qemu-devel@nongnu.org; Mon, 22 Apr 2013 08:32:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUFui-0007Ji-5j for qemu-devel@nongnu.org; Mon, 22 Apr 2013 08:32:12 -0400 Received: from mail-da0-x22a.google.com ([2607:f8b0:400e:c00::22a]:41814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUFiw-0002ru-OX for qemu-devel@nongnu.org; Mon, 22 Apr 2013 08:19:58 -0400 Received: by mail-da0-f42.google.com with SMTP id n15so1271225dad.29 for ; Mon, 22 Apr 2013 05:19:58 -0700 (PDT) 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=36FOdsF2wo/FIun6eJBYNgTNnRqbxMCkVCcn8x99q9c=; b=A/LJW0ZggNBrjCjjejtw//EWP66V6h+3lRS15u7i7ZXxl7HhaoZGgoXP4n7L1DgUwa cawvfSUrKnOKa2PbLZt82K/Aa1JoJOaQNJKjisy5mOCATlC91I2suOKYsvVBesbN8+2W zh3R9AHgv4ZLEjopXjexL6foFM71u/Xlmd6LpwLa9o2iQYqGQr7M5zjA4Vv4PGBBB0Ry gEG2f8vgUWgiXejiaDaWXjtkZHOdM2/AuNF+sX4kXiMYtYZwI4jBeCh391BSoD1xkelC MGu+SdMiogfE5LYmx+f45WvSSGc16rB8a+AfGHYWJBeOrUD1/vP3rm8ymcHa02cp9lkg /UTg== X-Received: by 10.68.180.4 with SMTP id dk4mr32198603pbc.104.1366633198096; Mon, 22 Apr 2013 05:19:58 -0700 (PDT) Received: from K55VM-ubuntu.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPS id qi1sm13134515pac.21.2013.04.22.05.19.53 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Apr 2013 05:19:56 -0700 (PDT) From: Liu Yuan To: qemu-devel@nongnu.org Date: Mon, 22 Apr 2013 20:19:41 +0800 Message-Id: <1366633182-9354-3-git-send-email-namei.unix@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1366633182-9354-1-git-send-email-namei.unix@gmail.com> References: <1366633182-9354-1-git-send-email-namei.unix@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c00::22a Cc: Kevin Wolf , sheepdog@lists.wpkg.org, Stefan Hajnoczi , MORITA Kazutaka Subject: [Qemu-devel] [PATCH v3 2/3] sheepdog: use BDRV_SECTOR_SIZE 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 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 c099117..0b700a3 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -89,7 +89,6 @@ #define SD_NR_VDIS (1U << 24) #define SD_DATA_OBJ_SIZE (UINT64_C(1) << 22) #define SD_MAX_VDI_SIZE (SD_DATA_OBJ_SIZE * MAX_DATA_OBJS) -#define SECTOR_SIZE 512 #define SD_INODE_SIZE (sizeof(SheepdogInode)) #define CURRENT_VDI_ID 0 @@ -1220,7 +1219,7 @@ static int sd_open(BlockDriverState *bs, const char *filename, s->min_dirty_data_idx = UINT32_MAX; s->max_dirty_data_idx = 0; - bs->total_sectors = s->inode.vdi_size / SECTOR_SIZE; + bs->total_sectors = s->inode.vdi_size / BDRV_SECTOR_SIZE; pstrcpy(s->name, sizeof(s->name), vdi); qemu_co_mutex_init(&s->lock); g_free(buf); @@ -1605,10 +1604,10 @@ static int coroutine_fn sd_co_rw_vector(void *p) { SheepdogAIOCB *acb = p; int ret = 0; - unsigned long len, done = 0, total = acb->nb_sectors * SECTOR_SIZE; - unsigned long idx = acb->sector_num * SECTOR_SIZE / SD_DATA_OBJ_SIZE; + unsigned long len, done = 0, total = acb->nb_sectors * BDRV_SECTOR_SIZE; + unsigned long idx = acb->sector_num * BDRV_SECTOR_SIZE / SD_DATA_OBJ_SIZE; uint64_t oid; - uint64_t offset = (acb->sector_num * SECTOR_SIZE) % SD_DATA_OBJ_SIZE; + uint64_t offset = (acb->sector_num * BDRV_SECTOR_SIZE) % SD_DATA_OBJ_SIZE; BDRVSheepdogState *s = acb->common.bs->opaque; SheepdogInode *inode = &s->inode; AIOReq *aio_req; @@ -1727,7 +1726,7 @@ static coroutine_fn int sd_co_writev(BlockDriverState *bs, int64_t sector_num, int ret; if (bs->growable && sector_num + nb_sectors > bs->total_sectors) { - ret = sd_truncate(bs, (sector_num + nb_sectors) * SECTOR_SIZE); + ret = sd_truncate(bs, (sector_num + nb_sectors) * BDRV_SECTOR_SIZE); if (ret < 0) { return ret; }