From ad04e0d8c43b8e142acf0cff9c7e59648b329f7b Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 25 Jun 2020 10:35:19 +0200 Subject: [PATCH] cleanup: use errors.As() in cephfs.checkVolExists() See-also: https://github.com/golang/go/wiki/ErrorValueFAQ#how-should-i-change-my-error-handling-code-to-work-with-the-new-features Signed-off-by: Niels de Vos --- internal/cephfs/fsjournal.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/cephfs/fsjournal.go b/internal/cephfs/fsjournal.go index 549326551..1a4c727f0 100644 --- a/internal/cephfs/fsjournal.go +++ b/internal/cephfs/fsjournal.go @@ -18,6 +18,7 @@ package cephfs import ( "context" + "errors" "github.com/ceph/ceph-csi/internal/util" @@ -73,7 +74,8 @@ func checkVolExists(ctx context.Context, volOptions *volumeOptions, secret map[s _, err = getVolumeRootPathCeph(ctx, volOptions, cr, volumeID(vid.FsSubvolName)) if err != nil { - if _, ok := err.(ErrVolumeNotFound); ok { + var evnf ErrVolumeNotFound + if errors.As(err, &evnf) { err = j.UndoReservation(ctx, volOptions.MetadataPool, volOptions.MetadataPool, vid.FsSubvolName, volOptions.RequestName) return nil, err