Skip to content

Commit

Permalink
Merge pull request moby#11083 from MabinGo/minor_typo
Browse files Browse the repository at this point in the history
Modify the minor typo in deviceset.go
  • Loading branch information
estesp committed Mar 2, 2015
2 parents 360adc7 + 5c1559a commit 738bdec
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions daemon/graphdriver/devmapper/deviceset.go
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ func (devices *DeviceSet) unregisterDevice(id int, hash string) error {
devices.devicesLock.Unlock()

if err := devices.removeMetadata(info); err != nil {
log.Debugf("Error removing meta data: %s", err)
log.Debugf("Error removing metadata: %s", err)
return err
}

Expand Down Expand Up @@ -857,7 +857,7 @@ func (devices *DeviceSet) rollbackTransaction() error {

dinfo := &DevInfo{Hash: devices.DeviceIdHash}
if err := devices.removeMetadata(dinfo); err != nil {
log.Errorf("Warning: Unable to remove meta data: %s", err)
log.Errorf("Warning: Unable to remove metadata: %s", err)
} else {
devices.markDeviceIdFree(devices.DeviceId)
}
Expand Down Expand Up @@ -925,15 +925,15 @@ func (devices *DeviceSet) openTransaction(hash string, DeviceId int) error {
devices.DeviceIdHash = hash
devices.DeviceId = DeviceId
if err := devices.saveTransactionMetaData(); err != nil {
return fmt.Errorf("Error saving transaction meta data: %s", err)
return fmt.Errorf("Error saving transaction metadata: %s", err)
}
return nil
}

func (devices *DeviceSet) refreshTransaction(DeviceId int) error {
devices.DeviceId = DeviceId
if err := devices.saveTransactionMetaData(); err != nil {
return fmt.Errorf("Error saving transaction meta data: %s", err)
return fmt.Errorf("Error saving transaction metadata: %s", err)
}
return nil
}
Expand Down

0 comments on commit 738bdec

Please sign in to comment.