From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ws9jh-0001e7-OU for qemu-devel@nongnu.org; Wed, 04 Jun 2014 07:52:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ws9ja-0002Q6-VG for qemu-devel@nongnu.org; Wed, 04 Jun 2014 07:52:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ws9ja-0002Pc-ME for qemu-devel@nongnu.org; Wed, 04 Jun 2014 07:51:58 -0400 From: Markus Armbruster Date: Wed, 4 Jun 2014 13:51:49 +0200 Message-Id: <1401882711-30508-9-git-send-email-armbru@redhat.com> In-Reply-To: <1401882711-30508-1-git-send-email-armbru@redhat.com> References: <1401882711-30508-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v4 08/10] block: Drop superfluous aligning of bdrv_getlength()'s value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit@irqsave.net, stefanha@redhat.com, mreitz@redhat.com It returns a multiple of the sector size. Signed-off-by: Markus Armbruster Reviewed-by: Max Reitz Reviewed-by: Benoit Canet --- block.c | 1 - block/qcow2.c | 1 - 2 files changed, 2 deletions(-) diff --git a/block.c b/block.c index ee007c2..cae9085 100644 --- a/block.c +++ b/block.c @@ -1261,7 +1261,6 @@ void bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) error_setg_errno(errp, -total_size, "Could not get image size"); goto out; } - total_size &= BDRV_SECTOR_MASK; /* Create the temporary image */ ret = get_tmp_filename(tmp_filename, PATH_MAX + 1); diff --git a/block/qcow2.c b/block/qcow2.c index 1f15adf..1cfcb63 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1926,7 +1926,6 @@ static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num, /* align end of file to a sector boundary to ease reading with sector based I/Os */ cluster_offset = bdrv_getlength(bs->file); - cluster_offset = (cluster_offset + 511) & ~511; bdrv_truncate(bs->file, cluster_offset); return 0; } -- 1.9.3