Browse code

Fix wrong variable name on blkio resources

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Tonis Tiigi authored on 2016/03/25 06:07:22
Showing 1 changed files
... ...
@@ -130,7 +130,7 @@ func getBlkioWeightDevices(config containertypes.Resources) ([]specs.WeightDevic
130 130
 		weight := weightDevice.Weight
131 131
 		d := specs.WeightDevice{Weight: &weight}
132 132
 		d.Major = int64(stat.Rdev / 256)
133
-		d.Major = int64(stat.Rdev % 256)
133
+		d.Minor = int64(stat.Rdev % 256)
134 134
 		blkioWeightDevices = append(blkioWeightDevices, d)
135 135
 	}
136 136
 
... ...
@@ -187,7 +187,7 @@ func getBlkioReadIOpsDevices(config containertypes.Resources) ([]specs.ThrottleD
187 187
 		rate := iopsDevice.Rate
188 188
 		d := specs.ThrottleDevice{Rate: &rate}
189 189
 		d.Major = int64(stat.Rdev / 256)
190
-		d.Major = int64(stat.Rdev % 256)
190
+		d.Minor = int64(stat.Rdev % 256)
191 191
 		blkioReadIOpsDevice = append(blkioReadIOpsDevice, d)
192 192
 	}
193 193
 
... ...
@@ -205,7 +205,7 @@ func getBlkioWriteIOpsDevices(config containertypes.Resources) ([]specs.Throttle
205 205
 		rate := iopsDevice.Rate
206 206
 		d := specs.ThrottleDevice{Rate: &rate}
207 207
 		d.Major = int64(stat.Rdev / 256)
208
-		d.Major = int64(stat.Rdev % 256)
208
+		d.Minor = int64(stat.Rdev % 256)
209 209
 		blkioWriteIOpsDevice = append(blkioWriteIOpsDevice, d)
210 210
 	}
211 211
 
... ...
@@ -223,7 +223,7 @@ func getBlkioReadBpsDevices(config containertypes.Resources) ([]specs.ThrottleDe
223 223
 		rate := bpsDevice.Rate
224 224
 		d := specs.ThrottleDevice{Rate: &rate}
225 225
 		d.Major = int64(stat.Rdev / 256)
226
-		d.Major = int64(stat.Rdev % 256)
226
+		d.Minor = int64(stat.Rdev % 256)
227 227
 		blkioReadBpsDevice = append(blkioReadBpsDevice, d)
228 228
 	}
229 229
 
... ...
@@ -241,7 +241,7 @@ func getBlkioWriteBpsDevices(config containertypes.Resources) ([]specs.ThrottleD
241 241
 		rate := bpsDevice.Rate
242 242
 		d := specs.ThrottleDevice{Rate: &rate}
243 243
 		d.Major = int64(stat.Rdev / 256)
244
-		d.Major = int64(stat.Rdev % 256)
244
+		d.Minor = int64(stat.Rdev % 256)
245 245
 		blkioWriteBpsDevice = append(blkioWriteBpsDevice, d)
246 246
 	}
247 247