fix logic

Signed-off-by: Niclas Schad <niclas.schad@stackit.cloud>

Author: nschad

pkg/csi/util/mount/mount.go

@@ -162,7 +162,6 @@ func CountNonVirtioBlockDevices() (int64, error) {
 			// 2. Check if the port has downstream devices
 			// If the bridge has children, they appear as subdirectories
 			// matching the PCI address format (e.g., 0000:01:00.0)
-			isNonBlockDevice := false
 			files, err2 := os.ReadDir(devPath)
 			if err2 != nil {
 				klog.Errorf("failed to read dir %s : %v", devPath, err2)
@@ -171,14 +170,13 @@ func CountNonVirtioBlockDevices() (int64, error) {
 				// Ignore PCI bus directories such as pci001 pci002 and pci010
 				// Devices must follow <domain:bus:device.function> format
 				if pciAddressRegex.MatchString(file.Name()) {
-					isNonBlockDevice = IsNonBlockDevice(devPath, file, isNonBlockDevice)
+					isNonBlockDevice := IsNonBlockDevice(devPath, file)
+					if isNonBlockDevice {
+						pcieSlotsOccupiedByNonBlockDevice++
+					}
 					break
 				}
 			}
-
-			if isNonBlockDevice {
-				pcieSlotsOccupiedByNonBlockDevice++
-			}
 		} else {
 			klog.Infof("skipping class %s: path: %s", class, devPath)
 		}
@@ -187,20 +185,21 @@ func CountNonVirtioBlockDevices() (int64, error) {
 	return int64(pcieSlotsOccupiedByNonBlockDevice), nil
 }
 
-func IsNonBlockDevice(devPath string, file os.DirEntry, isNonBLockDevice bool) bool {
+func IsNonBlockDevice(devPath string, file os.DirEntry) bool {
+	var isNonBlockDevice bool
 	pciDevicePath := filepath.Join(devPath, file.Name())
-	deviceBuf, err := os.ReadFile(filepath.Join(pciDevicePath, "device"))
-	if err != nil {
-		klog.Errorf("failed to read PCI device file %s : %v", pciDevicePath, err)
-	}
 	vendorBuf, err := os.ReadFile(filepath.Join(pciDevicePath, "vendor"))
 	if err != nil {
 		klog.Errorf("failed to read PCI device vendor %s : %v", pciDevicePath, err)
 	}
+	deviceBuf, err := os.ReadFile(filepath.Join(pciDevicePath, "device"))
+	if err != nil {
+		klog.Errorf("failed to read PCI device file %s : %v", pciDevicePath, err)
+	}
 	if strings.TrimSpace(string(vendorBuf)) == REDHAT_VENDOR && strings.TrimSpace(string(deviceBuf)) != VIRTIO_BLOCK_DEVICE {
-		isNonBLockDevice = true
+		isNonBlockDevice = true
 	}
-	return isNonBLockDevice
+	return isNonBlockDevice
 }
 
 // GetDevicePath returns the path of an attached block storage volume, specified by its id.