refactor(btrfs): separate init from implementation

knight42 · knight42 · commit a52daa26aee1 · 2020-09-03T19:54:18.000+08:00
Part of #4513 Signed-off-by: Jian Zeng <anonymousknight96@gmail.com>
diff --git a/cmd/containerd/builtins_btrfs_linux.go b/cmd/containerd/builtins_btrfs_linux.go
@@ -18,4 +18,4 @@
 
 package main
 
-import _ "github.com/containerd/containerd/snapshots/btrfs"
+import _ "github.com/containerd/containerd/snapshots/btrfs/plugin"
diff --git a/snapshots/btrfs/btrfs.go b/snapshots/btrfs/btrfs.go
@@ -26,31 +26,18 @@ import (
 	"strings"
 
 	"github.com/containerd/btrfs"
+	"github.com/containerd/continuity/fs"
+
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/storage"
-	"github.com/containerd/continuity/fs"
 
-	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
-func init() {
-	plugin.Register(&plugin.Registration{
-		ID:   "btrfs",
-		Type: plugin.SnapshotPlugin,
-		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			ic.Meta.Platforms = []ocispec.Platform{platforms.DefaultSpec()}
-			ic.Meta.Exports = map[string]string{"root": ic.Root}
-			return NewSnapshotter(ic.Root)
-		},
-	})
-}
-
 type snapshotter struct {
 	device string // device of the root
 	root   string // root provides paths for internal storage.

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,4 @@`
`18`	`18`
`19`	`19`	`package main`
`20`	`20`
`21`		`-import _ "github.com/containerd/containerd/snapshots/btrfs"`
	`21`	`+import _ "github.com/containerd/containerd/snapshots/btrfs/plugin"`