From c5cafe312862312cf2d8b6b85ae584bef3506e83 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 17 Jun 2021 11:41:29 +0530 Subject: [PATCH] rbd: make isThickProvisioned method of rbdImage isThickProvisioned can be used for both snapshot and clone validation if isThickProvisioned is method of common rbdImage structure. Signed-off-by: Madhu Rajanna (cherry picked from commit fc442221e4ff52d1f4f840e50bf277abf3c194be) --- internal/rbd/rbd_util.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index 1705f6e14..5cdbefa09 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -1435,13 +1435,13 @@ func (rv *rbdVolume) setThickProvisioned() error { // isThickProvisioned checks in the image metadata if the image has been marked // as thick-provisioned. This can be used while expanding the image, so that // the expansion can be allocated too. -func (rv *rbdVolume) isThickProvisioned() (bool, error) { - value, err := rv.GetMetadata(thickProvisionMetaKey) +func (ri *rbdImage) isThickProvisioned() (bool, error) { + value, err := ri.GetMetadata(thickProvisionMetaKey) if err != nil { if err == librbd.ErrNotFound { return false, nil } - return false, fmt.Errorf("failed to get metadata %q for %q: %w", thickProvisionMetaKey, rv.String(), err) + return false, fmt.Errorf("failed to get metadata %q for %q: %w", thickProvisionMetaKey, ri, err) } thick, err := strconv.ParseBool(value)