Fix build errors

Author: mshahzeb

blockdevice/stats.go

@@ -303,14 +303,6 @@ func parseProcDiskstats(r io.Reader) ([]Diskstats, error) {
 	return diskstats, scanner.Err()
 }
 
-func parseProcDiskstats(r io.Reader) ([]Diskstats, error) {
-	// Read device ioerr_cnt and iodone_cnt
-	val, err := util.ReadHexFromFile(fs.sys.Path(sysBlockPath, device, sysIoDoneCntPath))
-	diskstats = append(diskstats, val)
-	val, err := util.ReadHexFromFile(fs.sys.Path(sysBlockPath, device, sysIoDoneCntPath))
-	diskstats = append(diskstats, val)
-}
-
 // SysBlockDevices lists the device names from /sys/block/<dev>.
 func (fs FS) SysBlockDevices() ([]string, error) {
 	deviceDirs, err := os.ReadDir(fs.sys.Path(sysBlockPath))
@@ -492,19 +484,21 @@ func (fs FS) SysBlockDeviceUnderlyingDevices(device string) (UnderlyingDeviceInf
 // SysBlockDeviceIO returns stats for the block device read io counters
 // IO done count: /sys/block/<disk>/device/iodone_cnt
 // IO error count: /sys/block/<disk>/device/ioerr_cnt
-func (fs FS) SysBlockDeviceIOStat(device string) (IOStats, int, error) {
+func (fs FS) SysBlockDeviceIOStat(device string) (IODeviceStats, error) {
 	var (
-		ioDeviceStats []IODeviceStats
+			ioDeviceStats IODeviceStats
+			err           error
 	)
 	for file, p := range map[string]*uint64{
-		"iodone_cnt":                     &ioDeviceStats.ioDoneCount,
-		"ioerr_cnt":                      &ioDeviceStats.ioErrCount,
+			"iodone_cnt": &ioDeviceStats.IODoneCount,
+			"ioerr_cnt":  &ioDeviceStats.IOErrCount,
 	} {
-		val, err := util.ReadUintFromFile(fs.sys.Path(sysBlockPath, device, sysDevicePath, file))
-		if err != nil {
-			return IODeviceStats{}, err
-		}
-		*p = val
+			var val uint64
+			val, err = util.ReadUintFromFile(fs.sys.Path(sysBlockPath, device, sysDevicePath, file))
+			if err != nil {
+					return IODeviceStats{}, err
+			}
+			*p = val
 	}
-	return ioDeviceStats, err
-}
+	return ioDeviceStats, nil
+}