From 83df1eae53a0e0e2b3b8ff0972f32ca110baf862 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Tue, 2 Aug 2022 09:50:18 +0200
Subject: [PATCH] rebase: k8s.io/mount-utils/IsNotMountPoint() is deprecated

IsNotMountPoint() is deprecated and Mounter.IsMountPoint() is
recommended to be used instead.

Reported-by: golangci/staticcheck
Signed-off-by: Niels de Vos <ndevos@redhat.com>
---
 internal/rbd/nodeserver.go | 12 ++++++------
 internal/rbd/rbd_util.go   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/internal/rbd/nodeserver.go b/internal/rbd/nodeserver.go
index da7fe96ad..9c863920c 100644
--- a/internal/rbd/nodeserver.go
+++ b/internal/rbd/nodeserver.go
@@ -858,7 +858,7 @@ func (ns *NodeServer) NodeUnpublishVolume(
 	targetPath := req.GetTargetPath()
 	// considering kubelet make sure node operations like unpublish/unstage...etc can not be called
 	// at same time, an explicit locking at time of nodeunpublish is not required.
-	notMnt, err := mount.IsNotMountPoint(ns.Mounter, targetPath)
+	isMnt, err := ns.Mounter.IsMountPoint(targetPath)
 	if err != nil {
 		if os.IsNotExist(err) {
 			// targetPath has already been deleted
@@ -869,7 +869,7 @@ func (ns *NodeServer) NodeUnpublishVolume(
 
 		return nil, status.Error(codes.NotFound, err.Error())
 	}
-	if notMnt {
+	if !isMnt {
 		if err = os.RemoveAll(targetPath); err != nil {
 			return nil, status.Error(codes.Internal, err.Error())
 		}
@@ -925,15 +925,15 @@ func (ns *NodeServer) NodeUnstageVolume(
 	stagingParentPath := req.GetStagingTargetPath()
 	stagingTargetPath := getStagingTargetPath(req)
 
-	notMnt, err := mount.IsNotMountPoint(ns.Mounter, stagingTargetPath)
+	isMnt, err := ns.Mounter.IsMountPoint(stagingTargetPath)
 	if err != nil {
 		if !os.IsNotExist(err) {
 			return nil, status.Error(codes.NotFound, err.Error())
 		}
 		// Continue on ENOENT errors as we may still have the image mapped
-		notMnt = true
+		isMnt = false
 	}
-	if !notMnt {
+	if isMnt {
 		// Unmounting the image
 		err = ns.Mounter.Unmount(stagingTargetPath)
 		if err != nil {
@@ -961,7 +961,7 @@ func (ns *NodeServer) NodeUnstageVolume(
 		log.UsefulLog(ctx, "failed to find image metadata: %v", err)
 		// It is an error if it was mounted, as we should have found the image metadata file with
 		// no errors
-		if !notMnt {
+		if isMnt {
 			return nil, status.Error(codes.Internal, err.Error())
 		}
 
diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go
index 3d36cf6f7..398557318 100644
--- a/internal/rbd/rbd_util.go
+++ b/internal/rbd/rbd_util.go
@@ -554,12 +554,12 @@ func checkValidImageFeatures(imageFeatures string, ok bool) bool {
 // isNotMountPoint checks whether MountPoint does not exists and
 // also discards error indicating mountPoint exists.
 func isNotMountPoint(mounter mount.Interface, stagingTargetPath string) (bool, error) {
-	isNotMnt, err := mount.IsNotMountPoint(mounter, stagingTargetPath)
+	isMnt, err := mounter.IsMountPoint(stagingTargetPath)
 	if os.IsNotExist(err) {
 		err = nil
 	}
 
-	return isNotMnt, err
+	return !isMnt, err
 }
 
 // isCephMgrSupported determines if the cluster has support for MGR based operation