From patchwork Fri Jun 6 04:35:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hitoshi Mitake X-Patchwork-Id: 356672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9CCFC140087 for ; Fri, 6 Jun 2014 14:36:52 +1000 (EST) Received: from localhost ([::1]:45116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wslta-0002cn-Jl for incoming@patchwork.ozlabs.org; Fri, 06 Jun 2014 00:36:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wslt4-0001Sa-D2 for qemu-devel@nongnu.org; Fri, 06 Jun 2014 00:36:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wslsz-0004hH-AT for qemu-devel@nongnu.org; Fri, 06 Jun 2014 00:36:18 -0400 Received: from sh.osrg.net ([192.16.179.4]:51577) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wslsy-0004h3-Rv for qemu-devel@nongnu.org; Fri, 06 Jun 2014 00:36:13 -0400 Received: from fs.osrg.net (localns.osrg.net [10.0.0.11]) by sh.osrg.net (8.14.4/8.14.4/OSRG-NET) with ESMTP id s564ZiLZ005129; Fri, 6 Jun 2014 13:35:44 +0900 Received: from salers05.osrg.net (unknown [10.100.1.6]) by fs.osrg.net (Postfix) with ESMTP id 76360F967; Fri, 6 Jun 2014 13:35:44 +0900 (JST) From: Hitoshi Mitake To: qemu-devel@nongnu.org Date: Fri, 6 Jun 2014 13:35:12 +0900 Message-Id: <1402029312-23953-3-git-send-email-mitake.hitoshi@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1402029312-23953-1-git-send-email-mitake.hitoshi@lab.ntt.co.jp> References: <1402029312-23953-1-git-send-email-mitake.hitoshi@lab.ntt.co.jp> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.3.9 (sh.osrg.net [192.16.179.4]); Fri, 06 Jun 2014 13:35:53 +0900 (JST) X-Virus-Scanned: clamav-milter 0.98.1 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 192.16.179.4 Cc: Kevin Wolf , sheepdog@lists.wpkg.org, mitake.hitoshi@gmail.com, Hitoshi Mitake , Stefan Hajnoczi , Liu Yuan , MORITA Kazutaka Subject: [Qemu-devel] [PATCH v3 2/2] sheepdog: reload only header in a case of live snapshot 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 sheepdog driver doesn't need to read data_vdi_id[] when a live snapshot is created. Cc: Kevin Wolf Cc: Stefan Hajnoczi Cc: Liu Yuan Cc: MORITA Kazutaka Signed-off-by: Hitoshi Mitake --- v2: - correct wrong spelling in the commit log block/sheepdog.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 637e57f..bb38e6b 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -200,6 +200,8 @@ typedef struct SheepdogInode { uint32_t data_vdi_id[MAX_DATA_OBJS]; } SheepdogInode; +#define SD_INODE_HEADER_SIZE offsetof(SheepdogInode, data_vdi_id) + /* * 64 bit FNV-1a non-zero initial basis */ @@ -1278,7 +1280,7 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t snapid, const char *tag) return -EIO; } - inode = g_malloc(sizeof(s->inode)); + inode = g_malloc(SD_INODE_HEADER_SIZE); ret = find_vdi_name(s, s->name, snapid, tag, &vid, false, &local_err); if (ret) { @@ -1288,13 +1290,14 @@ static int reload_inode(BDRVSheepdogState *s, uint32_t snapid, const char *tag) } ret = read_object(fd, (char *)inode, vid_to_vdi_oid(vid), - s->inode.nr_copies, sizeof(*inode), 0, s->cache_flags); + s->inode.nr_copies, SD_INODE_HEADER_SIZE, 0, + s->cache_flags); if (ret < 0) { goto out; } if (inode->vdi_id != s->inode.vdi_id) { - memcpy(&s->inode, inode, sizeof(s->inode)); + memcpy(&s->inode, inode, SD_INODE_HEADER_SIZE); } out: