docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix wrong variable name on blkio resources 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2016-03-24 14:07:22 -07:00
parent ee61235880
commit 8784bd6fde
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/daemon_unix.go
View File

@ -130,7 +130,7 @@ func getBlkioWeightDevices(config containertypes.Resources) ([]specs.WeightDevic
weight := weightDevice.Weight weight := weightDevice.Weight
d := specs.WeightDevice{Weight: &weight} d := specs.WeightDevice{Weight: &weight}
d.Major = int64(stat.Rdev / 256) d.Major = int64(stat.Rdev / 256)
d.Major = int64(stat.Rdev % 256) d.Minor = int64(stat.Rdev % 256)
blkioWeightDevices = append(blkioWeightDevices, d) blkioWeightDevices = append(blkioWeightDevices, d)
} }
@ -187,7 +187,7 @@ func getBlkioReadIOpsDevices(config containertypes.Resources) ([]specs.ThrottleD
rate := iopsDevice.Rate rate := iopsDevice.Rate
d := specs.ThrottleDevice{Rate: &rate} d := specs.ThrottleDevice{Rate: &rate}
d.Major = int64(stat.Rdev / 256) d.Major = int64(stat.Rdev / 256)
d.Major = int64(stat.Rdev % 256) d.Minor = int64(stat.Rdev % 256)
blkioReadIOpsDevice = append(blkioReadIOpsDevice, d) blkioReadIOpsDevice = append(blkioReadIOpsDevice, d)
} }
@ -205,7 +205,7 @@ func getBlkioWriteIOpsDevices(config containertypes.Resources) ([]specs.Throttle
rate := iopsDevice.Rate rate := iopsDevice.Rate
d := specs.ThrottleDevice{Rate: &rate} d := specs.ThrottleDevice{Rate: &rate}
d.Major = int64(stat.Rdev / 256) d.Major = int64(stat.Rdev / 256)
d.Major = int64(stat.Rdev % 256) d.Minor = int64(stat.Rdev % 256)
blkioWriteIOpsDevice = append(blkioWriteIOpsDevice, d) blkioWriteIOpsDevice = append(blkioWriteIOpsDevice, d)
} }
@ -223,7 +223,7 @@ func getBlkioReadBpsDevices(config containertypes.Resources) ([]specs.ThrottleDe
rate := bpsDevice.Rate rate := bpsDevice.Rate
d := specs.ThrottleDevice{Rate: &rate} d := specs.ThrottleDevice{Rate: &rate}
d.Major = int64(stat.Rdev / 256) d.Major = int64(stat.Rdev / 256)
d.Major = int64(stat.Rdev % 256) d.Minor = int64(stat.Rdev % 256)
blkioReadBpsDevice = append(blkioReadBpsDevice, d) blkioReadBpsDevice = append(blkioReadBpsDevice, d)
} }
@ -241,7 +241,7 @@ func getBlkioWriteBpsDevices(config containertypes.Resources) ([]specs.ThrottleD
rate := bpsDevice.Rate rate := bpsDevice.Rate
d := specs.ThrottleDevice{Rate: &rate} d := specs.ThrottleDevice{Rate: &rate}
d.Major = int64(stat.Rdev / 256) d.Major = int64(stat.Rdev / 256)
d.Major = int64(stat.Rdev % 256) d.Minor = int64(stat.Rdev % 256)
blkioWriteBpsDevice = append(blkioWriteBpsDevice, d) blkioWriteBpsDevice = append(blkioWriteBpsDevice, d)
} }