From c09700b5688847cfa2efad0ae1dab5cc14e521ed Mon Sep 17 00:00:00 2001
From: Praveen M <m.praveen@ibm.com>
Date: Mon, 30 Oct 2023 14:15:18 +0530
Subject: [PATCH] cleanup: removed unused SnapshotInfo from CheckSnapExists()

Signed-off-by: Praveen M <m.praveen@ibm.com>
---
 internal/cephfs/controllerserver.go |  2 +-
 internal/cephfs/store/fsjournal.go  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/internal/cephfs/controllerserver.go b/internal/cephfs/controllerserver.go
index 014fc769d..bd91954ca 100644
--- a/internal/cephfs/controllerserver.go
+++ b/internal/cephfs/controllerserver.go
@@ -830,7 +830,7 @@ func (cs *ControllerServer) CreateSnapshot(
 	}
 	defer cs.VolumeLocks.Release(sourceVolID)
 	snapName := req.GetName()
-	sid, _, err := store.CheckSnapExists(ctx, parentVolOptions, cephfsSnap, cs.ClusterName, cs.SetMetadata, cr)
+	sid, err := store.CheckSnapExists(ctx, parentVolOptions, cephfsSnap, cs.ClusterName, cs.SetMetadata, cr)
 	if err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
 	}
diff --git a/internal/cephfs/store/fsjournal.go b/internal/cephfs/store/fsjournal.go
index e9505b7ad..30aec4162 100644
--- a/internal/cephfs/store/fsjournal.go
+++ b/internal/cephfs/store/fsjournal.go
@@ -398,11 +398,11 @@ func CheckSnapExists(
 	clusterName string,
 	setMetadata bool,
 	cr *util.Credentials,
-) (*SnapshotIdentifier, *core.SnapshotInfo, error) {
+) (*SnapshotIdentifier, error) {
 	// Connect to cephfs' default radosNamespace (csi)
 	j, err := SnapJournal.Connect(volOptions.Monitors, fsutil.RadosNamespace, cr)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 	defer j.Destroy()
 
@@ -411,10 +411,10 @@ func CheckSnapExists(
 	snapData, err := j.CheckReservation(
 		ctx, volOptions.MetadataPool, snap.RequestName, snap.NamePrefix, volOptions.VolID, kmsID, encryptionType)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 	if snapData == nil {
-		return nil, nil, nil
+		return nil, nil
 	}
 	sid := &SnapshotIdentifier{}
 	snapUUID := snapData.ImageUUID
@@ -428,10 +428,10 @@ func CheckSnapExists(
 			err = j.UndoReservation(ctx, volOptions.MetadataPool,
 				volOptions.MetadataPool, snapID, snap.RequestName)
 
-			return nil, nil, err
+			return nil, err
 		}
 
-		return nil, nil, err
+		return nil, err
 	}
 
 	defer func() {
@@ -455,10 +455,10 @@ func CheckSnapExists(
 	sid.SnapshotID, err = util.GenerateVolID(ctx, volOptions.Monitors, cr, volOptions.FscID,
 		"", volOptions.ClusterID, snapUUID, fsutil.VolIDVersion)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 	log.DebugLog(ctx, "Found existing snapshot (%s) with subvolume name (%s) for request (%s)",
 		snapData.ImageAttributes.RequestName, volOptions.VolID, sid.FsSnapshotName)
 
-	return sid, &snapInfo, nil
+	return sid, nil
 }