deleted file mode 100644

@@ -1,14 +0,0 @@

-package docker

-

-type DeviceSet interface {

-	AddDevice(hash, baseHash string) error

-	SetInitialized(hash string) error

-	DeactivateDevice(hash string) error

-	RemoveDevice(hash string) error

-	MountDevice(hash, path string) error

-	UnmountDevice(hash, path string, deactivate bool) error

-	HasDevice(hash string) bool

-	HasInitializedDevice(hash string) bool

-	HasActivatedDevice(hash string) bool

-	Shutdown() error

-}

@@ -573,19 +573,6 @@ func (devices *DeviceSetDM) waitClose(hash string) error {

 	return nil

 }

-func (devices *DeviceSetDM) DeactivateDevice(hash string) error {

-	devices.Lock()

-	defer devices.Unlock()

-

-	if err := devices.ensureInit(); err != nil {

-		utils.Debugf("\n--->Err: %s\n", err)

-		return err

-	}

-

-	utils.Debugf("DeactivateDevice %s", hash)

-	return devices.deactivateDevice(hash)

-}

-

 func (devices *DeviceSetDM) Shutdown() error {

 	devices.Lock()

 	utils.Debugf("[devmapper] Shutting down DeviceSet: %s", devices.root)

@@ -6,6 +6,7 @@ import (

 	"encoding/json"

 	"fmt"

 	"github.com/dotcloud/docker/utils"

+	"github.com/dotcloud/docker/devmapper"

 	"io"

 	"io/ioutil"

 	"os"

@@ -334,7 +335,7 @@ func (image *Image) applyLayer(layer, target string) error {

 	return nil

 }

-func (image *Image) ensureImageDevice(devices DeviceSet) error {

+func (image *Image) ensureImageDevice(devices *devmapper.DeviceSetDM) error {

 	if devices.HasInitializedDevice(image.ID) {

 		return nil

 	}

@@ -43,7 +43,7 @@ type Runtime struct {

 	volumes        *Graph

 	srv            *Server

 	Dns            []string

-	deviceSet      DeviceSet

+	deviceSet      *devmapper.DeviceSetDM

 }

 var sysInitPath string

@@ -86,7 +86,7 @@ func (runtime *Runtime) getContainerElement(id string) *list.Element {

 	return nil

 }

-func (runtime *Runtime) GetDeviceSet() (DeviceSet, error) {

+func (runtime *Runtime) GetDeviceSet() (*devmapper.DeviceSetDM, error) {

 	if runtime.deviceSet == nil {

 		return nil, fmt.Errorf("No device set available")

 	}

@@ -324,62 +324,3 @@ func TestParseLxcConfOpt(t *testing.T) {

 		}

 	}

 }

-

-type DeviceSetWrapper struct {

-	wrapped DeviceSet

-	prefix  string

-}

-

-func (wrapper *DeviceSetWrapper) wrap(hash string) string {

-	if hash != "" {

-		hash = wrapper.prefix + "-" + hash

-	}

-	return hash

-}

-

-func (wrapper *DeviceSetWrapper) AddDevice(hash, baseHash string) error {

-	return wrapper.wrapped.AddDevice(wrapper.wrap(hash), wrapper.wrap(baseHash))

-}

-

-func (wrapper *DeviceSetWrapper) SetInitialized(hash string) error {

-	return wrapper.wrapped.SetInitialized(wrapper.wrap(hash))

-}

-

-func (wrapper *DeviceSetWrapper) DeactivateDevice(hash string) error {

-	return wrapper.wrapped.DeactivateDevice(wrapper.wrap(hash))

-}

-

-func (wrapper *DeviceSetWrapper) Shutdown() error {

-	return nil

-}

-

-func (wrapper *DeviceSetWrapper) RemoveDevice(hash string) error {

-	return wrapper.wrapped.RemoveDevice(wrapper.wrap(hash))

-}

-

-func (wrapper *DeviceSetWrapper) MountDevice(hash, path string) error {

-	return wrapper.wrapped.MountDevice(wrapper.wrap(hash), path)

-}

-

-func (wrapper *DeviceSetWrapper) UnmountDevice(hash, path string, deactivate bool) error {

-	return wrapper.wrapped.UnmountDevice(wrapper.wrap(hash), path, deactivate)

-}

-

-func (wrapper *DeviceSetWrapper) HasDevice(hash string) bool {

-	return wrapper.wrapped.HasDevice(wrapper.wrap(hash))

-}

-

-func (wrapper *DeviceSetWrapper) HasInitializedDevice(hash string) bool {

-	return wrapper.wrapped.HasInitializedDevice(wrapper.wrap(hash))

-}

-

-func (wrapper *DeviceSetWrapper) HasActivatedDevice(hash string) bool {

-	return wrapper.wrapped.HasActivatedDevice(wrapper.wrap(hash))

-}

-

-func NewDeviceSetWrapper(wrapped DeviceSet, prefix string) DeviceSet {

-	return &DeviceSetWrapper{

-		wrapped: wrapped,

-		prefix:  prefix,

-	}

-}