From aa8dccd220f21222a8a007e96cf0bd355f7de7e9 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 5 Apr 2019 11:19:40 +0200
Subject: [PATCH] update containerd/aufs
 f894a800659b6e11c1a13084abd1712f346e349c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 vendor.conf                                 |  2 +-
 vendor/github.com/containerd/aufs/README.md | 10 ++++++++++
 vendor/github.com/containerd/aufs/aufs.go   | 22 +++++++++++++++++----
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/vendor.conf b/vendor.conf
index 98b6c1526..aca9f7d72 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -83,4 +83,4 @@ github.com/pborman/uuid v1.2.0
 github.com/google/uuid v1.1.1
 
 # aufs dependencies
-github.com/containerd/aufs da3cf16bfbe68ba8f114f1536a05c01528a25434
+github.com/containerd/aufs f894a800659b6e11c1a13084abd1712f346e349c
diff --git a/vendor/github.com/containerd/aufs/README.md b/vendor/github.com/containerd/aufs/README.md
index 6995c4d5a..0f871b36d 100644
--- a/vendor/github.com/containerd/aufs/README.md
+++ b/vendor/github.com/containerd/aufs/README.md
@@ -21,3 +21,13 @@ import (
 	_ "github.com/containerd/containerd/snapshot/overlay"
 )
 ```
+
+## Project details
+
+aufs is a containerd sub-project, licensed under the [Apache 2.0 license](./LICENSE).
+As a containerd sub-project, you will find the:
+ * [Project governance](https://github.com/containerd/project/blob/master/GOVERNANCE.md),
+ * [Maintainers](https://github.com/containerd/project/blob/master/MAINTAINERS),
+ * and [Contributing guidelines](https://github.com/containerd/project/blob/master/CONTRIBUTING.md)
+
+information in our [`containerd/project`](https://github.com/containerd/project) repository.
diff --git a/vendor/github.com/containerd/aufs/aufs.go b/vendor/github.com/containerd/aufs/aufs.go
index 99fe28a57..ed4e28fec 100644
--- a/vendor/github.com/containerd/aufs/aufs.go
+++ b/vendor/github.com/containerd/aufs/aufs.go
@@ -1,3 +1,19 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
 package aufs
 
 import (
@@ -99,8 +115,7 @@ func (o *snapshotter) Update(ctx context.Context, info snapshots.Info, fieldpath
 
 // Usage returns the resources taken by the snapshot identified by key.
 //
-// For active snapshots, this will scan the usage of the overlay "diff" (aka
-// "upper") directory and may take some time.
+// For active snapshots, this will scan the usage of directory and may take some time.
 //
 // For committed snapshots, the value is returned from the metadata database.
 func (o *snapshotter) Usage(ctx context.Context, key string) (snapshots.Usage, error) {
@@ -318,8 +333,7 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
 
 func (o *snapshotter) mounts(s storage.Snapshot) []mount.Mount {
 	if len(s.ParentIDs) == 0 {
-		// if we only have one layer/no parents then just return a bind mount as overlay
-		// will not work
+		// if we only have one layer/no parents then just return a bind mount
 		roFlag := "rw"
 		if s.Kind == snapshots.KindView {
 			roFlag = "ro"