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

Refactor MountPoint Setup function in volume.go

Browse source 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
This commit is contained in:
Boaz Shuster 2017-06-30 11:04:35 +03:00
parent e066edcfcf
commit fb8b27cd41
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
volume/volume.go
View file

@ -153,20 +153,18 @@ func (m *MountPoint) Cleanup() error {
// before creating the source directory on the host. // before creating the source directory on the host.
func (m *MountPoint) Setup(mountLabel string, rootIDs idtools.IDPair, checkFun func(m *MountPoint) error) (path string, err error) { func (m *MountPoint) Setup(mountLabel string, rootIDs idtools.IDPair, checkFun func(m *MountPoint) error) (path string, err error) {
defer func() { defer func() {
if err == nil { if err != nil || !label.RelabelNeeded(m.Mode) {
if label.RelabelNeeded(m.Mode) { return
if err = label.Relabel(m.Source, mountLabel, label.IsShared(m.Mode)); err != nil { }
if err == syscall.ENOTSUP {
err = nil err = label.Relabel(m.Source, mountLabel, label.IsShared(m.Mode))
return if err == syscall.ENOTSUP {
} err = nil
path = "" }
err = errors.Wrapf(err, "error setting label on mount source '%s'", m.Source) if err != nil {
return path = ""
} err = errors.Wrapf(err, "error setting label on mount source '%s'", m.Source)
}
} }
return
}() }()
if m.Volume != nil { if m.Volume != nil {