github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #858 from stevvooe/remove-fsutils-pkg

Browse Source 
fs: remove fsutils package
This commit is contained in:
Stephen Day 2017-05-15 16:55:20 -07:00 committed by GitHub
commit 26a62223f3
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/fsutils/fsutils_linux.go → fs/dtype_linux.go
View File

@ -1,6 +1,6 @@
// +build linux // +build linux
package fsutils package fs
import ( import (
"fmt" "fmt"

2
fs/fsutils/fsutils_linux_test.go → fs/dtype_linux_test.go
View File

@ -1,6 +1,6 @@
// +build linux // +build linux
package fsutils package fs
import ( import (
"io/ioutil" "io/ioutil"

3
snapshot/overlay/overlay.go
View File

@ -12,7 +12,6 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/fs" "github.com/containerd/containerd/fs"
"github.com/containerd/containerd/fs/fsutils"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/snapshot" "github.com/containerd/containerd/snapshot"
@ -48,7 +47,7 @@ func NewSnapshotter(root string) (snapshot.Snapshotter, error) {
if err := os.MkdirAll(root, 0700); err != nil { if err := os.MkdirAll(root, 0700); err != nil {
return nil, err return nil, err
} }
supportsDType, err := fsutils.SupportsDType(root) supportsDType, err := fs.SupportsDType(root)
if err != nil { if err != nil {
return nil, err return nil, err
} }