ソースを参照

quota: move quota package out of graphdriver

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Timo Rothenpieler 4 年 前
コミット
c677e4cc87

+ 1 - 1
daemon/graphdriver/graphtest/graphtest_unix.go

@@ -13,8 +13,8 @@ import (
 	"unsafe"
 
 	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/daemon/graphdriver/quota"
 	"github.com/docker/docker/pkg/stringid"
+	"github.com/docker/docker/quota"
 	units "github.com/docker/go-units"
 	"golang.org/x/sys/unix"
 	"gotest.tools/v3/assert"

+ 1 - 1
daemon/graphdriver/overlay2/overlay.go

@@ -18,7 +18,6 @@ import (
 	"github.com/containerd/containerd/sys"
 	"github.com/docker/docker/daemon/graphdriver"
 	"github.com/docker/docker/daemon/graphdriver/overlayutils"
-	"github.com/docker/docker/daemon/graphdriver/quota"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/chrootarchive"
 	"github.com/docker/docker/pkg/containerfs"
@@ -27,6 +26,7 @@ import (
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/parsers"
 	"github.com/docker/docker/pkg/system"
+	"github.com/docker/docker/quota"
 	units "github.com/docker/go-units"
 	"github.com/moby/locker"
 	"github.com/moby/sys/mount"

+ 1 - 1
daemon/graphdriver/vfs/driver.go

@@ -6,12 +6,12 @@ import (
 	"path/filepath"
 
 	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/daemon/graphdriver/quota"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/containerfs"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/parsers"
 	"github.com/docker/docker/pkg/system"
+	"github.com/docker/docker/quota"
 	units "github.com/docker/go-units"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"

+ 1 - 1
daemon/graphdriver/vfs/quota_linux.go

@@ -1,7 +1,7 @@
 package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"
 
 import (
-	"github.com/docker/docker/daemon/graphdriver/quota"
+	"github.com/docker/docker/quota"
 	"github.com/sirupsen/logrus"
 )
 

+ 1 - 1
daemon/graphdriver/vfs/quota_unsupported.go

@@ -2,7 +2,7 @@
 
 package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"
 
-import "github.com/docker/docker/daemon/graphdriver/quota"
+import "github.com/docker/docker/quota"
 
 type driverQuota struct {
 }

+ 1 - 1
daemon/graphdriver/quota/errors.go → quota/errors.go

@@ -1,4 +1,4 @@
-package quota // import "github.com/docker/docker/daemon/graphdriver/quota"
+package quota // import "github.com/docker/docker/quota"
 
 import "github.com/docker/docker/errdefs"
 

+ 1 - 1
daemon/graphdriver/quota/projectquota.go → quota/projectquota.go

@@ -9,7 +9,7 @@
 //       for both xfs/ext4 for kernel version >= v4.5
 //
 
-package quota // import "github.com/docker/docker/daemon/graphdriver/quota"
+package quota // import "github.com/docker/docker/quota"
 
 /*
 #include <stdlib.h>

+ 1 - 1
daemon/graphdriver/quota/projectquota_test.go → quota/projectquota_test.go

@@ -1,6 +1,6 @@
 // +build linux
 
-package quota // import "github.com/docker/docker/daemon/graphdriver/quota"
+package quota // import "github.com/docker/docker/quota"
 
 import (
 	"io"

+ 1 - 1
daemon/graphdriver/quota/projectquota_unsupported.go → quota/projectquota_unsupported.go

@@ -1,6 +1,6 @@
 // +build linux,exclude_disk_quota linux,!cgo !linux
 
-package quota // import "github.com/docker/docker/daemon/graphdriver/quota"
+package quota // import "github.com/docker/docker/quota"
 
 func NewControl(basePath string) (*Control, error) {
 	return nil, ErrQuotaNotSupported

+ 1 - 1
daemon/graphdriver/quota/types.go → quota/types.go

@@ -1,4 +1,4 @@
-package quota // import "github.com/docker/docker/daemon/graphdriver/quota"
+package quota // import "github.com/docker/docker/quota"
 
 import "sync"