Am 23.11.22 um 03:03 schrieb Wang ShaoBo:
> A submitter workqueue is dynamically allocated by init_submitter()
> called by drbd_create_device(), we should destroy it when this
> device is not needed or destroyed.
>
> Fixes: 113fef9e20e0 ("drbd: prepare to queue write requests on a submit worker")
> Signed-off-by: Wang ShaoBo <bobo.shaobowang@xxxxxxxxxx>
> ---
>
> v3:
> - add out_* label for destroy_workqueue().
>
> drivers/block/drbd/drbd_main.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
> index 78cae4e75af1..677240232684 100644
> --- a/drivers/block/drbd/drbd_main.c
> +++ b/drivers/block/drbd/drbd_main.c
> @@ -2217,6 +2217,8 @@ void drbd_destroy_device(struct kref *kref)
> kref_put(&peer_device->connection->kref, drbd_destroy_connection);
> kfree(peer_device);
> }
> + if (device->submit.wq)
> + destroy_workqueue(device->submit.wq);
> kfree(device);
> kref_put(&resource->kref, drbd_destroy_resource);
> }
> @@ -2771,7 +2773,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
>
> err = add_disk(disk);
> if (err)
> - goto out_idr_remove_from_resource;
> + goto out_destroy_workqueue;
>
> /* inherit the connection state */
> device->state.conn = first_connection(resource)->cstate;
> @@ -2785,6 +2787,8 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
> drbd_debugfs_device_add(device);
> return NO_ERROR;
>
> +out_destroy_workqueue:
> + destroy_workqueue(device->submit.wq);
> out_idr_remove_from_resource:
> for_each_connection_safe(connection, n, resource) {
> peer_device = idr_remove(&connection->peer_devices, vnr);
Thanks!
Reviewed-by: Christoph Böhmwalder <christoph.boehmwalder@xxxxxxxxxx>
--
Christoph Böhmwalder
LINBIT | Keeping the Digital World Running
DRBD HA — Disaster Recovery — Software defined Storage
