From 6b5ef1d76aa2a523eec670d55be30c85c37ab3b9 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 19 Mar 2024 18:36:17 +0100 Subject: [PATCH] journal: remove unused parameter journalPoolID from ReserveName() Signed-off-by: Niels de Vos --- internal/cephfs/store/volumegroup.go | 2 +- internal/journal/volumegroupjournal.go | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/cephfs/store/volumegroup.go b/internal/cephfs/store/volumegroup.go index 3d302ffc5..ea1c66e4d 100644 --- a/internal/cephfs/store/volumegroup.go +++ b/internal/cephfs/store/volumegroup.go @@ -245,7 +245,7 @@ func ReserveVolumeGroup( defer j.Destroy() groupUUID, vgsi.FsVolumeGroupSnapshotName, err = j.ReserveName( - ctx, volOptions.MetadataPool, util.InvalidPoolID, volOptions.RequestName, volOptions.NamePrefix) + ctx, volOptions.MetadataPool, volOptions.RequestName, volOptions.NamePrefix) if err != nil { return nil, err } diff --git a/internal/journal/volumegroupjournal.go b/internal/journal/volumegroupjournal.go index 990c38d85..949cc9145 100644 --- a/internal/journal/volumegroupjournal.go +++ b/internal/journal/volumegroupjournal.go @@ -51,8 +51,7 @@ type VolumeGroupJournal interface { objectUUID string) (*VolumeGroupAttributes, error) ReserveName( ctx context.Context, - journalPool string, - journalPoolID int64, + journalPool, reqName, namePrefix string) (string, string, error) // AddVolumesMapping adds a volumeMap map which contains volumeID's and its @@ -296,7 +295,6 @@ held, to prevent parallel operations from modifying the state of the omaps for t Input arguments: - journalPool: Pool where the CSI journal is stored - - journalPoolID: pool ID of the journalPool - reqName: Name of the volumeGroupSnapshot request received - namePrefix: Prefix to use when generating the volumeGroupName name (suffix is an auto-generated UUID) @@ -306,8 +304,7 @@ Return values: - error: non-nil in case of any errors */ func (vgjc *VolumeGroupJournalConnection) ReserveName(ctx context.Context, - journalPool string, journalPoolID int64, - reqName, namePrefix string, + journalPool, reqName, namePrefix string, ) (string, string, error) { cj := vgjc.config