From 364e36ec7e181e6cb87a823f7c2ae6f8d9fad3f3 Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Mon, 27 Jun 2022 14:52:23 +0200 Subject: [PATCH] Revert "fix deinitialization of moved composite volume" The proper way to avoid calling on_deinit() callback on an already deinitialized volume is to deinitialize type callbacks, as it is done in the previous commit. This reverts commit a7f70687a97943a4f1ae7301541b5ec1a6307424. Signed-off-by: Adam Rutkowski --- src/ocf_composite_volume.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/ocf_composite_volume.c b/src/ocf_composite_volume.c index a6bf91f..d1530ec 100644 --- a/src/ocf_composite_volume.c +++ b/src/ocf_composite_volume.c @@ -152,11 +152,6 @@ static void ocf_composite_volume_on_deinit(ocf_volume_t cvolume) struct ocf_composite_volume *composite = ocf_volume_get_priv(cvolume); int i; - /* priv can be NULL if this volume had been moved from. In this case - * it's the owner responsibility to deinit member volumes. */ - if (!composite) - return; - for (i = 0; i < composite->members_cnt; i++) ocf_volume_deinit(&composite->member[i].volume); }