| Message ID | 1422300468-16216-3-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 01/26/2015 12:27 PM, Max Reitz wrote: > bdrv_unref() can lead to bdrv_close(), which in turn will result in > bdrv_drain_all(). This function will later be called blk_drain_all() and > iterate only over the BlockBackends for which blk_is_inserted() holds > true; therefore, bdrv_is_inserted() and thus quorum_is_inserted() will > probably be called. > > This patch makes quorum_is_inserted() aware of the fact that some > children may have been closed already. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > block/quorum.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > for (i = 0; i < s->num_children; i++) { > - if (!bdrv_is_inserted(s->bs[i])) { > + if (s->bs[i] && !bdrv_is_inserted(s->bs[i])) { > return 0; May have a minor conflict if you fix the earlier series to use bool for this function's return type. But that should not get in the way of: Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/block/quorum.c b/block/quorum.c index 7811c4a..b249d75 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -1005,6 +1005,7 @@ static void quorum_close(BlockDriverState *bs) for (i = 0; i < s->num_children; i++) { bdrv_unref(s->bs[i]); + s->bs[i] = NULL; } g_free(s->bs); @@ -1070,7 +1071,7 @@ static int quorum_is_inserted(BlockDriverState *bs) int i; for (i = 0; i < s->num_children; i++) { - if (!bdrv_is_inserted(s->bs[i])) { + if (s->bs[i] && !bdrv_is_inserted(s->bs[i])) { return 0; } }
bdrv_unref() can lead to bdrv_close(), which in turn will result in bdrv_drain_all(). This function will later be called blk_drain_all() and iterate only over the BlockBackends for which blk_is_inserted() holds true; therefore, bdrv_is_inserted() and thus quorum_is_inserted() will probably be called. This patch makes quorum_is_inserted() aware of the fact that some children may have been closed already. Signed-off-by: Max Reitz <mreitz@redhat.com> --- block/quorum.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)