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

devicemapper: Unmount when removing device

Browse source 
Without this the remove will fail due to a busy device.
This commit is contained in:
Alexander Larsson 2013-11-19 14:40:15 +01:00
parent e42b574579
commit 0ed762f2d2
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
graphdriver/devmapper/driver.go
View file

@ -61,6 +61,10 @@ func (d *Driver) Create(id string, parent string) error {
}
func (d *Driver) Remove(id string) error {
mp := path.Join(d.home, "mnt", id)
if err := d.unmount(id, mp); err != nil {
return err
}
return d.DeviceSet.RemoveDevice(id)
}
@ -90,3 +94,14 @@ func (d *Driver) mount(id, mountPoint string) error {
// Mount the device
return d.DeviceSet.MountDevice(id, mountPoint, false)
}
func (d *Driver) unmount(id, mountPoint string) error {
// If mountpoint is not mounted, do nothing
if mounted, err := Mounted(mountPoint); err != nil {
return fmt.Errorf("Error checking mountpoint: %s", err)
} else if !mounted {
return nil
}
// Unmount the device
return d.DeviceSet.UnmountDevice(id, mountPoint, true)
}