| Message ID | 1430887928-18189-4-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 05/06/2015 12:52 AM, Fam Zheng wrote: > Using this function would always be wrong because a dirty bitmap must > have a specific owner that consumes the dirty bits and calls > bdrv_reset_dirty_bitmap(). > Good point. > Remove the unused function to avoid future misuse. > > Reviewed-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > block.c | 12 ------------ > include/block/block_int.h | 2 -- > 2 files changed, 14 deletions(-) > > diff --git a/block.c b/block.c > index 7904098..511e13c 100644 > --- a/block.c > +++ b/block.c > @@ -3324,18 +3324,6 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, > } > } > > -void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, > - int nr_sectors) > -{ > - BdrvDirtyBitmap *bitmap; > - QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) { > - if (!bdrv_dirty_bitmap_enabled(bitmap)) { > - continue; > - } > - hbitmap_reset(bitmap->bitmap, cur_sector, nr_sectors); > - } > -} > - > /** > * Advance an HBitmapIter to an arbitrary offset. > */ > diff --git a/include/block/block_int.h b/include/block/block_int.h > index db29b74..aaed2fa 100644 > --- a/include/block/block_int.h > +++ b/include/block/block_int.h > @@ -635,7 +635,5 @@ bool blk_dev_is_medium_locked(BlockBackend *blk); > void blk_dev_resize_cb(BlockBackend *blk); > > void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors); > -void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, > - int nr_sectors); > > #endif /* BLOCK_INT_H */ > Reviewed-by: John Snow <jsnow@redhat.com>
diff --git a/block.c b/block.c index 7904098..511e13c 100644 --- a/block.c +++ b/block.c @@ -3324,18 +3324,6 @@ void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, } } -void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, - int nr_sectors) -{ - BdrvDirtyBitmap *bitmap; - QLIST_FOREACH(bitmap, &bs->dirty_bitmaps, list) { - if (!bdrv_dirty_bitmap_enabled(bitmap)) { - continue; - } - hbitmap_reset(bitmap->bitmap, cur_sector, nr_sectors); - } -} - /** * Advance an HBitmapIter to an arbitrary offset. */ diff --git a/include/block/block_int.h b/include/block/block_int.h index db29b74..aaed2fa 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -635,7 +635,5 @@ bool blk_dev_is_medium_locked(BlockBackend *blk); void blk_dev_resize_cb(BlockBackend *blk); void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors); -void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, - int nr_sectors); #endif /* BLOCK_INT_H */