From c677e4cc8793384d711cf0fc75b1578bb423d4f9 Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Sun, 9 Aug 2020 20:04:43 +0000 Subject: [PATCH] quota: move quota package out of graphdriver Signed-off-by: Timo Rothenpieler --- daemon/graphdriver/graphtest/graphtest_unix.go | 2 +- daemon/graphdriver/overlay2/overlay.go | 2 +- daemon/graphdriver/vfs/driver.go | 2 +- daemon/graphdriver/vfs/quota_linux.go | 2 +- daemon/graphdriver/vfs/quota_unsupported.go | 2 +- {daemon/graphdriver/quota => quota}/errors.go | 2 +- {daemon/graphdriver/quota => quota}/projectquota.go | 2 +- {daemon/graphdriver/quota => quota}/projectquota_test.go | 2 +- {daemon/graphdriver/quota => quota}/projectquota_unsupported.go | 2 +- {daemon/graphdriver/quota => quota}/types.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename {daemon/graphdriver/quota => quota}/errors.go (85%) rename {daemon/graphdriver/quota => quota}/projectquota.go (99%) rename {daemon/graphdriver/quota => quota}/projectquota_test.go (98%) rename {daemon/graphdriver/quota => quota}/projectquota_unsupported.go (87%) rename {daemon/graphdriver/quota => quota}/types.go (83%) diff --git a/daemon/graphdriver/graphtest/graphtest_unix.go b/daemon/graphdriver/graphtest/graphtest_unix.go index aae88615a0..4073e0b7a0 100644 --- a/daemon/graphdriver/graphtest/graphtest_unix.go +++ b/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" diff --git a/daemon/graphdriver/overlay2/overlay.go b/daemon/graphdriver/overlay2/overlay.go index 29689a459f..39e8cf246d 100644 --- a/daemon/graphdriver/overlay2/overlay.go +++ b/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" diff --git a/daemon/graphdriver/vfs/driver.go b/daemon/graphdriver/vfs/driver.go index 98824bb07e..b341de5b89 100644 --- a/daemon/graphdriver/vfs/driver.go +++ b/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" diff --git a/daemon/graphdriver/vfs/quota_linux.go b/daemon/graphdriver/vfs/quota_linux.go index 3af797819e..372cbbb769 100644 --- a/daemon/graphdriver/vfs/quota_linux.go +++ b/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" ) diff --git a/daemon/graphdriver/vfs/quota_unsupported.go b/daemon/graphdriver/vfs/quota_unsupported.go index 025326748c..06ebf8aee8 100644 --- a/daemon/graphdriver/vfs/quota_unsupported.go +++ b/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 { } diff --git a/daemon/graphdriver/quota/errors.go b/quota/errors.go similarity index 85% rename from daemon/graphdriver/quota/errors.go rename to quota/errors.go index 68e797470d..37f3438bd0 100644 --- a/daemon/graphdriver/quota/errors.go +++ b/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" diff --git a/daemon/graphdriver/quota/projectquota.go b/quota/projectquota.go similarity index 99% rename from daemon/graphdriver/quota/projectquota.go rename to quota/projectquota.go index 0b71d17149..f9f41f13c2 100644 --- a/daemon/graphdriver/quota/projectquota.go +++ b/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 diff --git a/daemon/graphdriver/quota/projectquota_test.go b/quota/projectquota_test.go similarity index 98% rename from daemon/graphdriver/quota/projectquota_test.go rename to quota/projectquota_test.go index 632ea6d14e..5cf39ae7e1 100644 --- a/daemon/graphdriver/quota/projectquota_test.go +++ b/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" diff --git a/daemon/graphdriver/quota/projectquota_unsupported.go b/quota/projectquota_unsupported.go similarity index 87% rename from daemon/graphdriver/quota/projectquota_unsupported.go rename to quota/projectquota_unsupported.go index 72fe9bb082..1c72c3daea 100644 --- a/daemon/graphdriver/quota/projectquota_unsupported.go +++ b/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 diff --git a/daemon/graphdriver/quota/types.go b/quota/types.go similarity index 83% rename from daemon/graphdriver/quota/types.go rename to quota/types.go index 7a527a7238..4661bc74e0 100644 --- a/daemon/graphdriver/quota/types.go +++ b/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"