[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 03/19] block: Drop bdrv_is_first_non_filter()
From: |
Max Reitz |
Subject: |
[PATCH v4 03/19] block: Drop bdrv_is_first_non_filter() |
Date: |
Tue, 18 Feb 2020 11:34:38 +0100 |
It is unused now. (And it was ugly because it needed to explore all BDS
chains from the top.)
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block.c | 26 --------------------------
include/block/block.h | 1 -
2 files changed, 27 deletions(-)
diff --git a/block.c b/block.c
index 998bb41a5b..f6731fa9be 100644
--- a/block.c
+++ b/block.c
@@ -6235,32 +6235,6 @@ bool bdrv_recurse_is_first_non_filter(BlockDriverState
*bs,
return false;
}
-/* This function checks if the candidate is the first non filter bs down it's
- * bs chain. Since we don't have pointers to parents it explore all bs chains
- * from the top. Some filters can choose not to pass down the recursion.
- */
-bool bdrv_is_first_non_filter(BlockDriverState *candidate)
-{
- BlockDriverState *bs;
- BdrvNextIterator it;
-
- /* walk down the bs forest recursively */
- for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
- bool perm;
-
- /* try to recurse in this top level bs */
- perm = bdrv_recurse_is_first_non_filter(bs, candidate);
-
- /* candidate is the first non filter */
- if (perm) {
- bdrv_next_cleanup(&it);
- return true;
- }
- }
-
- return false;
-}
-
BlockDriverState *check_to_replace_node(BlockDriverState *parent_bs,
const char *node_name, Error **errp)
{
diff --git a/include/block/block.h b/include/block/block.h
index 78026679ab..a6c0f6668e 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -394,7 +394,6 @@ int bdrv_amend_options(BlockDriverState *bs_new, QemuOpts
*opts,
/* external snapshots */
bool bdrv_recurse_is_first_non_filter(BlockDriverState *bs,
BlockDriverState *candidate);
-bool bdrv_is_first_non_filter(BlockDriverState *candidate);
/* check if a named node can be replaced when doing drive-mirror */
BlockDriverState *check_to_replace_node(BlockDriverState *parent_bs,
--
2.24.1
- [PATCH v4 00/19] block: Fix check_to_replace_node(), Max Reitz, 2020/02/18
- [PATCH v4 01/19] blockdev: Allow external snapshots everywhere, Max Reitz, 2020/02/18
- [PATCH v4 02/19] blockdev: Allow resizing everywhere, Max Reitz, 2020/02/18
- [PATCH v4 03/19] block: Drop bdrv_is_first_non_filter(),
Max Reitz <=
- [PATCH v4 04/19] iotests: Let 041 use -blockdev for quorum children, Max Reitz, 2020/02/18
- [PATCH v4 05/19] quorum: Fix child permissions, Max Reitz, 2020/02/18
- [PATCH v4 06/19] block: Add bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 07/19] blkverify: Implement .bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 08/19] quorum: Implement .bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 09/19] block: Use bdrv_recurse_can_replace(), Max Reitz, 2020/02/18
- [PATCH v4 10/19] block: Remove bdrv_recurse_is_first_non_filter(), Max Reitz, 2020/02/18
- [PATCH v4 12/19] quorum: Stop marking it as a filter, Max Reitz, 2020/02/18
- [PATCH v4 11/19] mirror: Double-check immediately before replacing, Max Reitz, 2020/02/18
- [PATCH v4 13/19] iotests: Use complete_and_wait() in 155, Max Reitz, 2020/02/18