Patchwork [v2] cow: use bdrv_co_is_allocated()

login
register
mail settings
Submitter Stefan Hajnoczi
Date Nov. 23, 2011, 3 p.m.
Message ID <1322060404-15494-1-git-send-email-stefanha@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/127319/
State New
Headers show

Comments

Stefan Hajnoczi - Nov. 23, 2011, 3 p.m.
Now that bdrv_co_is_allocated() is available we can use it instead of
the synchronous bdrv_is_allocated() interface.  This is a follow-up that
Kevin Wolf <kwolf@redhat.com> pointed out after applying the series that
introduces bdrv_co_is_allocated().

It is safe to make cow_read() a coroutine_fn because its only caller is
a coroutine_fn.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 block/cow.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Kevin Wolf - Nov. 23, 2011, 4:08 p.m.
Am 23.11.2011 16:00, schrieb Stefan Hajnoczi:
> Now that bdrv_co_is_allocated() is available we can use it instead of
> the synchronous bdrv_is_allocated() interface.  This is a follow-up that
> Kevin Wolf <kwolf@redhat.com> pointed out after applying the series that
> introduces bdrv_co_is_allocated().
> 
> It is safe to make cow_read() a coroutine_fn because its only caller is
> a coroutine_fn.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Thanks, applied to the block branch (for 1.1)

Kevin

Patch

diff --git a/block/cow.c b/block/cow.c
index 7ae887b..586493c 100644
--- a/block/cow.c
+++ b/block/cow.c
@@ -171,14 +171,14 @@  static int cow_update_bitmap(BlockDriverState *bs, int64_t sector_num,
     return error;
 }
 
-static int cow_read(BlockDriverState *bs, int64_t sector_num,
-                    uint8_t *buf, int nb_sectors)
+static int coroutine_fn cow_read(BlockDriverState *bs, int64_t sector_num,
+                                 uint8_t *buf, int nb_sectors)
 {
     BDRVCowState *s = bs->opaque;
     int ret, n;
 
     while (nb_sectors > 0) {
-        if (bdrv_is_allocated(bs, sector_num, nb_sectors, &n)) {
+        if (bdrv_co_is_allocated(bs, sector_num, nb_sectors, &n)) {
             ret = bdrv_pread(bs->file,
                         s->cow_sectors_offset + sector_num * 512,
                         buf, n * 512);