From: Markus Armbruster <armbru@redhat.com>
Date: Thu, 26 Jun 2014 11:23:23 +0000 (+0200)
Subject: block: Drop superfluous aligning of bdrv_getlength()'s value
X-Git-Tag: qemu-xen-4.6.0-rc1~264^2~52
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=75d3d21f9ed9fc66a56d4d7cf491d504541fc6ac;p=qemu-xen.git

block: Drop superfluous aligning of bdrv_getlength()'s value

It returns a multiple of the sector size.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/block.c b/block.c
index 2fcc2f738a..1af74e601b 100644
--- a/block.c
+++ b/block.c
@@ -1314,7 +1314,6 @@ int 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 ad93824c6c..964ab93b08 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1947,7 +1947,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;
     }