diff mbox

[14/27] block/parallels: create bat2sect helper

Message ID 1425977481-13317-15-git-send-email-den@openvz.org
State New
Headers show

Commit Message

Denis V. Lunev March 10, 2015, 8:51 a.m. UTC 
deduplicate copy/paste arithmetcs

Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Roman Kagan <rkagan@parallels.com>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/parallels.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Roman Kagan March 10, 2015, 12:14 p.m. UTC | #1 
On Tue, Mar 10, 2015 at 11:51:08AM +0300, Denis V. Lunev wrote:
> deduplicate copy/paste arithmetcs
> 
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Roman Kagan <rkagan@parallels.com>
> CC: Kevin Wolf <kwolf@redhat.com>
> CC: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  block/parallels.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)

Reviewed-by: Roman Kagan <rkagan@parallels.com>

Roman.
diff mbox

Patch

diff --git a/block/parallels.c b/block/parallels.c
index 3d5f509..95e99cc 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -151,6 +151,12 @@  fail:
     return ret;
 }
 
+
+static int64_t bat2sect(BDRVParallelsState *s, uint32_t idx)
+{
+    return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier;
+}
+
 static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num)
 {
     uint32_t index, offset;
@@ -161,7 +167,7 @@  static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num)
     /* not allocated */
     if ((index >= s->bat_size) || (s->bat_bitmap[index] == 0))
         return -1;
-    return (uint64_t)s->bat_bitmap[index] * s->off_multiplier + offset;
+    return bat2sect(s, index) + offset;
 }
 
 static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num,
@@ -185,7 +191,7 @@  static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num)
         return -EINVAL;
     }
     if (s->bat_bitmap[idx] != 0) {
-        return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier + offset;
+        return bat2sect(s, idx) + offset;
     }
 
     pos = bdrv_getlength(bs->file) >> BDRV_SECTOR_BITS;
@@ -199,7 +205,7 @@  static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num)
     if (ret < 0) {
         return ret;
     }
-    return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier + offset;
+    return bat2sect(s, idx) + offset;
 }
 
 static int64_t coroutine_fn parallels_co_get_block_status(BlockDriverState *bs,