1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request from anusha-ragunathan/plugin-lookup

Remove extra map lookup for volume drivers.
This commit is contained in:
Sebastiaan van Stijn 2016-07-19 20:52:39 +02:00 committed by GitHub
commit 4498214a2a

View file

@ -107,19 +107,15 @@ func lookup(name string) (volume.Driver, error) {
return nil, fmt.Errorf("Error looking up volume plugin %s: %v", name, err) return nil, fmt.Errorf("Error looking up volume plugin %s: %v", name, err)
} }
drivers.Lock()
defer drivers.Unlock()
if ext, ok := drivers.extensions[name]; ok {
return ext, nil
}
d := NewVolumeDriver(name, p.Client()) d := NewVolumeDriver(name, p.Client())
if err := validateDriver(d); err != nil { if err := validateDriver(d); err != nil {
return nil, err return nil, err
} }
if p.IsLegacy() { if p.IsLegacy() {
drivers.Lock()
drivers.extensions[name] = d drivers.extensions[name] = d
drivers.Unlock()
} }
return d, nil return d, nil
} }