From 420aa9ec577a974fd83c2a7e2b76bc8959d99586 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Thu, 11 Nov 2021 10:02:41 +0530 Subject: [PATCH] rbd: remove redundant rbdVol.getTrashPath() function This commit removes rbdVol.getTrashPath() function since it is no longer being used due to introduction of go-ceph rbd admin task api for deletion. Signed-off-by: Rakshith R --- internal/rbd/rbd_util.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index 6b0ff2739..5d916a80e 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -617,16 +617,6 @@ func isCephMgrSupported(ctx context.Context, clusterID string, err error) bool { return true } -// getTrashPath returns the image path for trash operation. -func (rv *rbdVolume) getTrashPath() string { - trashPath := rv.Pool - if rv.RadosNamespace != "" { - trashPath = trashPath + "/" + rv.RadosNamespace - } - - return trashPath + "/" + rv.ImageID -} - // ensureImageCleanup finds image in trash and if found removes it // from trash. func (rv *rbdVolume) ensureImageCleanup(ctx context.Context) error {