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

Merge pull request #11083 from MabinGo/minor_typo 

Modify the minor typo in deviceset.go
This commit is contained in:
Phil Estes 2015-03-02 13:11:14 -05:00
parent 360adc707b 5c1559a754
commit 738bdec490
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/graphdriver/devmapper/deviceset.go
View File

@ -392,7 +392,7 @@ func (devices *DeviceSet) unregisterDevice(id int, hash string) error {
devices.devicesLock.Unlock() devices.devicesLock.Unlock()
if err := devices.removeMetadata(info); err != nil { if err := devices.removeMetadata(info); err != nil {
log.Debugf("Error removing meta data: %s", err) log.Debugf("Error removing metadata: %s", err)
return err return err
} }
@ -857,7 +857,7 @@ func (devices *DeviceSet) rollbackTransaction() error {
dinfo := &DevInfo{Hash: devices.DeviceIdHash} dinfo := &DevInfo{Hash: devices.DeviceIdHash}
if err := devices.removeMetadata(dinfo); err != nil { 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 { } else {
devices.markDeviceIdFree(devices.DeviceId) devices.markDeviceIdFree(devices.DeviceId)
} }
@ -925,7 +925,7 @@ func (devices *DeviceSet) openTransaction(hash string, DeviceId int) error {
devices.DeviceIdHash = hash devices.DeviceIdHash = hash
devices.DeviceId = DeviceId devices.DeviceId = DeviceId
if err := devices.saveTransactionMetaData(); err != nil { 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 return nil
} }
@ -933,7 +933,7 @@ func (devices *DeviceSet) openTransaction(hash string, DeviceId int) error {
func (devices *DeviceSet) refreshTransaction(DeviceId int) error { func (devices *DeviceSet) refreshTransaction(DeviceId int) error {
devices.DeviceId = DeviceId devices.DeviceId = DeviceId
if err := devices.saveTransactionMetaData(); err != nil { 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 return nil
} }