From 320dd709358c7962e062118c77bb5902b5382bf0 Mon Sep 17 00:00:00 2001
From: Stephen J Day <stephen.day@docker.com>
Date: Mon, 15 May 2017 15:13:38 -0700
Subject: [PATCH] fs: remove fsutils package

No need to have a util package under a package... er, package.

We should move most of this functionality to continuity.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
---
 fs/{fsutils/fsutils_linux.go => dtype_linux.go}           | 2 +-
 fs/{fsutils/fsutils_linux_test.go => dtype_linux_test.go} | 2 +-
 snapshot/overlay/overlay.go                               | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename fs/{fsutils/fsutils_linux.go => dtype_linux.go} (99%)
 rename fs/{fsutils/fsutils_linux_test.go => dtype_linux_test.go} (99%)

diff --git a/fs/fsutils/fsutils_linux.go b/fs/dtype_linux.go
similarity index 99%
rename from fs/fsutils/fsutils_linux.go
rename to fs/dtype_linux.go
index c8cac3072..cc06573f1 100644
--- a/fs/fsutils/fsutils_linux.go
+++ b/fs/dtype_linux.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package fsutils
+package fs
 
 import (
 	"fmt"
diff --git a/fs/fsutils/fsutils_linux_test.go b/fs/dtype_linux_test.go
similarity index 99%
rename from fs/fsutils/fsutils_linux_test.go
rename to fs/dtype_linux_test.go
index 221e4f00b..42724196c 100644
--- a/fs/fsutils/fsutils_linux_test.go
+++ b/fs/dtype_linux_test.go
@@ -1,6 +1,6 @@
 // +build linux
 
-package fsutils
+package fs
 
 import (
 	"io/ioutil"
diff --git a/snapshot/overlay/overlay.go b/snapshot/overlay/overlay.go
index 5a17a60bc..a0b64d3c5 100644
--- a/snapshot/overlay/overlay.go
+++ b/snapshot/overlay/overlay.go
@@ -12,7 +12,6 @@ import (
 
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/fs"
-	"github.com/containerd/containerd/fs/fsutils"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/snapshot"
@@ -48,7 +47,7 @@ func NewSnapshotter(root string) (snapshot.Snapshotter, error) {
 	if err := os.MkdirAll(root, 0700); err != nil {
 		return nil, err
 	}
-	supportsDType, err := fsutils.SupportsDType(root)
+	supportsDType, err := fs.SupportsDType(root)
 	if err != nil {
 		return nil, err
 	}