[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 04/13] block: Drop detached child from ignore list
From: |
Hanna Reitz |
Subject: |
[PULL v2 04/13] block: Drop detached child from ignore list |
Date: |
Tue, 16 Nov 2021 14:06:09 +0100 |
bdrv_attach_child_common_abort() restores the parent's AioContext. To
do so, the child (which was supposed to be attached, but is now detached
again by this abort handler) is added to the ignore list for the
AioContext changing functions.
However, since we modify a BDS's children list in the BdrvChildClass's
.attach and .detach handlers, the child is already effectively detached
from the parent by this point. We do not need to put it into the ignore
list.
Use this opportunity to clean up the empty line structure: Keep setting
the ignore list, invoking the AioContext function, and freeing the
ignore list in blocks separated by empty lines.
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20211111120829.81329-5-hreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20211115145409.176785-5-kwolf@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
block.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index 19bff4f95c..c7d5aa5254 100644
--- a/block.c
+++ b/block.c
@@ -2774,14 +2774,16 @@ static void bdrv_attach_child_common_abort(void *opaque)
}
if (bdrv_child_get_parent_aio_context(child) != s->old_parent_ctx) {
- GSList *ignore = g_slist_prepend(NULL, child);
+ GSList *ignore;
+ /* No need to ignore `child`, because it has been detached already */
+ ignore = NULL;
child->klass->can_set_aio_ctx(child, s->old_parent_ctx, &ignore,
&error_abort);
g_slist_free(ignore);
- ignore = g_slist_prepend(NULL, child);
- child->klass->set_aio_ctx(child, s->old_parent_ctx, &ignore);
+ ignore = NULL;
+ child->klass->set_aio_ctx(child, s->old_parent_ctx, &ignore);
g_slist_free(ignore);
}
--
2.33.1
- [PULL v2 00/13] Block patches, Hanna Reitz, 2021/11/16
- [PULL v2 03/13] block: Unite remove_empty_child and child_free, Hanna Reitz, 2021/11/16
- [PULL v2 02/13] block: Manipulate children list in .attach/.detach, Hanna Reitz, 2021/11/16
- [PULL v2 04/13] block: Drop detached child from ignore list,
Hanna Reitz <=
- [PULL v2 05/13] block: Pass BdrvChild ** to replace_child_noperm, Hanna Reitz, 2021/11/16
- [PULL v2 07/13] transactions: Invoke clean() after everything else, Hanna Reitz, 2021/11/16
- [PULL v2 06/13] block: Restructure remove_file_or_backing_child(), Hanna Reitz, 2021/11/16
- [PULL v2 08/13] block: Let replace_child_tran keep indirect pointer, Hanna Reitz, 2021/11/16
- [PULL v2 11/13] docs: Deprecate incorrectly typed device_add arguments, Hanna Reitz, 2021/11/16
- [PULL v2 12/13] softmmu/qdev-monitor: fix use-after-free in qdev_set_id(), Hanna Reitz, 2021/11/16
- [PULL v2 09/13] block: Let replace_child_noperm free children, Hanna Reitz, 2021/11/16
- [PULL v2 10/13] iotests/030: Unthrottle parallel jobs in reverse, Hanna Reitz, 2021/11/16
- [PULL v2 13/13] file-posix: Fix alignment after reopen changing O_DIRECT, Hanna Reitz, 2021/11/16
- [PULL v2 01/13] stream: Traverse graph after modification, Hanna Reitz, 2021/11/16