new file mode 100644

@@ -0,0 +1,23 @@

+package blkiodev

+

+import "fmt"

+

+// WeightDevice is a structure that hold device:weight pair

+type WeightDevice struct {

+	Path   string

+	Weight uint16

+}

+

+func (w *WeightDevice) String() string {

+	return fmt.Sprintf("%s:%d", w.Path, w.Weight)

+}

+

+// ThrottleDevice is a structure that hold device:rate_per_second pair

+type ThrottleDevice struct {

+	Path string

+	Rate uint64

+}

+

+func (t *ThrottleDevice) String() string {

+	return fmt.Sprintf("%s:%d", t.Path, t.Rate)

+}

old mode 100755

new mode 100644

@@ -12,12 +12,12 @@ import (

 	"syscall"

 	"github.com/Sirupsen/logrus"

+	pblkiodev "github.com/docker/docker/api/types/blkiodev"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/daemon/graphdriver"

 	derr "github.com/docker/docker/errors"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/layer"

-	pblkiodev "github.com/docker/docker/pkg/blkiodev"

 	"github.com/docker/docker/pkg/idtools"

 	"github.com/docker/docker/pkg/parsers/kernel"

 	"github.com/docker/docker/pkg/sysinfo"

@@ -8,7 +8,7 @@ import (

 	"strconv"

 	"strings"

-	"github.com/docker/docker/pkg/blkiodev"

+	"github.com/docker/docker/api/types/blkiodev"

 	"github.com/docker/go-units"

 )

@@ -3,7 +3,7 @@ package opts

 import (

 	"fmt"

-	"github.com/docker/docker/pkg/blkiodev"

+	"github.com/docker/docker/api/types/blkiodev"

 )

 // ThrottledeviceOpt defines a map of ThrottleDevices

@@ -3,7 +3,7 @@ package opts

 import (

 	"fmt"

-	"github.com/docker/docker/pkg/blkiodev"

+	"github.com/docker/docker/api/types/blkiodev"

 )

 // WeightdeviceOpt defines a map of WeightDevices

deleted file mode 100644

@@ -1,25 +0,0 @@

-package blkiodev

-

-import (

-	"fmt"

-)

-

-// WeightDevice is a structure that hold device:weight pair

-type WeightDevice struct {

-	Path   string

-	Weight uint16

-}

-

-func (w *WeightDevice) String() string {

-	return fmt.Sprintf("%s:%d", w.Path, w.Weight)

-}

-

-// ThrottleDevice is a structure that hold device:rate_per_second pair

-type ThrottleDevice struct {

-	Path string

-	Rate uint64

-}

-

-func (t *ThrottleDevice) String() string {

-	return fmt.Sprintf("%s:%d", t.Path, t.Rate)

-}

@@ -5,8 +5,8 @@ import (

 	"io"

 	"strings"

+	"github.com/docker/docker/api/types/blkiodev"

 	"github.com/docker/docker/api/types/strslice"

-	"github.com/docker/docker/pkg/blkiodev"

 	"github.com/docker/docker/pkg/nat"

 	"github.com/docker/docker/pkg/ulimit"

 )