block/write-threshold: drop extra APIs

bdrv_write_threshold_exceeded() is unused.

bdrv_write_threshold_is_set() is used only to double check the value of
bs->write_threshold_offset in tests. No real sense in it (both tests do
check real value with help of bdrv_write_threshold_get())

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210506090621.11848-5-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[mreitz: Adjusted commit message as per Eric's suggestion]
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-05-06 12:06:17 +03:00 committed by Max Reitz
parent e46354a8ae
commit 2e0e9cbd89
3 changed files with 0 additions and 47 deletions

View File

@ -24,25 +24,6 @@ uint64_t bdrv_write_threshold_get(const BlockDriverState *bs)
return bs->write_threshold_offset; return bs->write_threshold_offset;
} }
bool bdrv_write_threshold_is_set(const BlockDriverState *bs)
{
return bs->write_threshold_offset > 0;
}
uint64_t bdrv_write_threshold_exceeded(const BlockDriverState *bs,
const BdrvTrackedRequest *req)
{
if (bdrv_write_threshold_is_set(bs)) {
if (req->offset > bs->write_threshold_offset) {
return (req->offset - bs->write_threshold_offset) + req->bytes;
}
if ((req->offset + req->bytes) > bs->write_threshold_offset) {
return (req->offset + req->bytes) - bs->write_threshold_offset;
}
}
return 0;
}
void bdrv_write_threshold_set(BlockDriverState *bs, uint64_t threshold_bytes) void bdrv_write_threshold_set(BlockDriverState *bs, uint64_t threshold_bytes)
{ {
bs->write_threshold_offset = threshold_bytes; bs->write_threshold_offset = threshold_bytes;

View File

@ -35,30 +35,6 @@ void bdrv_write_threshold_set(BlockDriverState *bs, uint64_t threshold_bytes);
*/ */
uint64_t bdrv_write_threshold_get(const BlockDriverState *bs); uint64_t bdrv_write_threshold_get(const BlockDriverState *bs);
/*
* bdrv_write_threshold_is_set
*
* Tell if a write threshold is set for a given BDS.
*/
bool bdrv_write_threshold_is_set(const BlockDriverState *bs);
/*
* bdrv_write_threshold_exceeded
*
* Return the extent of a write request that exceeded the threshold,
* or zero if the request is below the threshold.
* Return zero also if the threshold was not set.
*
* NOTE: here we assume the following holds for each request this code
* deals with:
*
* assert((req->offset + req->bytes) <= UINT64_MAX)
*
* Please not there is *not* an actual C assert().
*/
uint64_t bdrv_write_threshold_exceeded(const BlockDriverState *bs,
const BdrvTrackedRequest *req);
/* /*
* bdrv_write_threshold_check_write * bdrv_write_threshold_check_write
* *

View File

@ -18,8 +18,6 @@ static void test_threshold_not_set_on_init(void)
BlockDriverState bs; BlockDriverState bs;
memset(&bs, 0, sizeof(bs)); memset(&bs, 0, sizeof(bs));
g_assert(!bdrv_write_threshold_is_set(&bs));
res = bdrv_write_threshold_get(&bs); res = bdrv_write_threshold_get(&bs);
g_assert_cmpint(res, ==, 0); g_assert_cmpint(res, ==, 0);
} }
@ -33,8 +31,6 @@ static void test_threshold_set_get(void)
bdrv_write_threshold_set(&bs, threshold); bdrv_write_threshold_set(&bs, threshold);
g_assert(bdrv_write_threshold_is_set(&bs));
res = bdrv_write_threshold_get(&bs); res = bdrv_write_threshold_get(&bs);
g_assert_cmpint(res, ==, threshold); g_assert_cmpint(res, ==, threshold);
} }