From 075abcac678a414fa1b38f597782052724a90db3 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 20 Jan 2025 16:47:34 +0100 Subject: [PATCH] rbd: make `cleanupRBDImage` a function of `rbdVolume` Signed-off-by: Niels de Vos --- internal/rbd/controllerserver.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go index d2db6e1a2..05a8f4bab 100644 --- a/internal/rbd/controllerserver.go +++ b/internal/rbd/controllerserver.go @@ -981,12 +981,12 @@ func (cs *ControllerServer) DeleteVolume( } defer cs.VolumeLocks.Release(requestName) - return cleanupRBDImage(ctx, rbdVol, cr) + return rbdVol.cleanupRBDImage(ctx, cr) } // cleanupRBDImage removes the rbd image and OMAP metadata associated with it. -func cleanupRBDImage(ctx context.Context, - rbdVol *rbdVolume, cr *util.Credentials, +func (rbdVol *rbdVolume) cleanupRBDImage(ctx context.Context, + cr *util.Credentials, ) (*csi.DeleteVolumeResponse, error) { info, err := rbdVol.GetMirroringInfo(ctx) if err != nil {