Update containerd before release.

Signed-off-by: Lantao Liu <lantaol@google.com>

vendor.conf

@@ -4,7 +4,7 @@ github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd
 github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
 github.com/containerd/cgroups fe281dd265766145e943a034aa41086474ea6130
 github.com/containerd/console cb7008ab3d8359b78c5f464cb7cf160107ad5925
-github.com/containerd/containerd v1.1.0-rc.2
+github.com/containerd/containerd 1381f8fddc4f826e12b48d46c9def347d5aa338a
 github.com/containerd/continuity 3e8f2ea4b190484acb976a5b378d373429639a1a
 github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
 github.com/containerd/go-cni f2d7272f12d045b16ed924f50e91f9f9cecc55a7

vendor/github.com/containerd/containerd/client.go

@@ -320,7 +320,7 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image
 		childrenHandler := images.ChildrenHandler(store)
 		// Set any children labels for that content
 		childrenHandler = images.SetChildrenLabels(store, childrenHandler)
-		// Filter childen by platforms
+		// Filter children by platforms
 		childrenHandler = images.FilterPlatforms(childrenHandler, pullCtx.Platforms...)
 
 		handler = images.Handlers(append(pullCtx.BaseHandlers,

vendor/github.com/containerd/containerd/cmd/ctr/commands/run/run.go

@@ -62,7 +62,7 @@ var ContainerFlags = []cli.Flag{
 	},
 	cli.StringSliceFlag{
 		Name:  "mount",
-		Usage: "specify additional container mount (ex: type=bind,src=/tmp,dest=/host,options=rbind:ro)",
+		Usage: "specify additional container mount (ex: type=bind,src=/tmp,dst=/host,options=rbind:ro)",
 	},
 	cli.BoolFlag{
 		Name:  "net-host",

vendor/github.com/containerd/containerd/content/helpers.go

@@ -136,10 +136,7 @@ func Copy(ctx context.Context, cw Writer, r io.Reader, size int64, expected dige
 		}
 	}
 
-	buf := bufPool.Get().(*[]byte)
+	if _, err := copyWithBuffer(cw, r); err != nil {
-	defer bufPool.Put(buf)
-
-	if _, err := io.CopyBuffer(cw, r, *buf); err != nil {
 		return err
 	}
 
@@ -160,11 +157,7 @@ func CopyReaderAt(cw Writer, ra ReaderAt, n int64) error {
 		return err
 	}
 
-	buf := bufPool.Get().(*[]byte)
+	_, err = copyWithBuffer(cw, io.NewSectionReader(ra, ws.Offset, n))
-	defer bufPool.Put(buf)
-
-	_, err = io.CopyBuffer(cw, io.NewSectionReader(ra, ws.Offset, n), *buf)
-
 	return err
 }
 
@@ -195,10 +188,7 @@ func seekReader(r io.Reader, offset, size int64) (io.Reader, error) {
 	}
 
 	// well then, let's just discard up to the offset
-	buf := bufPool.Get().(*[]byte)
+	n, err := copyWithBuffer(ioutil.Discard, io.LimitReader(r, offset))
-	defer bufPool.Put(buf)
-
-	n, err := io.CopyBuffer(ioutil.Discard, io.LimitReader(r, offset), *buf)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to discard to offset")
 	}
@@ -208,3 +198,10 @@ func seekReader(r io.Reader, offset, size int64) (io.Reader, error) {
 
 	return r, nil
 }
+
+func copyWithBuffer(dst io.Writer, src io.Reader) (written int64, err error) {
+	buf := bufPool.Get().(*[]byte)
+	written, err = io.CopyBuffer(dst, src, *buf)
+	bufPool.Put(buf)
+	return
+}

vendor/github.com/containerd/containerd/defaults/doc.go

@@ -14,6 +14,6 @@
    limitations under the License.
 */
 
-// Package defaults provides several common defaults for interacting wtih
+// Package defaults provides several common defaults for interacting with
 // containerd. These can be used on the client-side or server-side.
 package defaults

vendor/github.com/containerd/containerd/filters/filter.go

@@ -92,7 +92,7 @@ var Always FilterFunc = func(adaptor Adaptor) bool {
 	return true
 }
 
-// Any allows multiple filters to be matched aginst the object
+// Any allows multiple filters to be matched against the object
 type Any []Filter
 
 // Match returns true if any of the provided filters are true
@@ -106,7 +106,7 @@ func (m Any) Match(adaptor Adaptor) bool {
 	return false
 }
 
-// All allows multiple filters to be matched aginst the object
+// All allows multiple filters to be matched against the object
 type All []Filter
 
 // Match only returns true if all filters match the object

vendor/github.com/containerd/containerd/gc/scheduler/scheduler.go

@@ -315,7 +315,7 @@ func (s *gcScheduler) run(ctx context.Context) {
 			// Reschedule garbage collection for same duration + 1 second
 			schedC, nextCollection = schedule(nextCollection.Sub(*lastCollection) + time.Second)
 
-			// Update last collection time even though failure occured
+			// Update last collection time even though failure occurred
 			lastCollection = &last
 
 			for _, w := range s.waiters {

vendor/github.com/containerd/containerd/images/image.go

@@ -279,7 +279,7 @@ func Check(ctx context.Context, provider content.Provider, image ocispec.Descrip
 
 	// TODO(stevvooe): It is possible that referenced conponents could have
 	// children, but this is rare. For now, we ignore this and only verify
-	// that manfiest components are present.
+	// that manifest components are present.
 	required = append([]ocispec.Descriptor{mfst.Config}, mfst.Layers...)
 
 	for _, desc := range required {

vendor/github.com/containerd/containerd/linux/runtime.go

@@ -200,7 +200,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts
 			log.G(ctx).WithField("id", id).Info("shim reaped")
 			t, err := r.tasks.Get(ctx, id)
 			if err != nil {
-				// Task was never started or was already sucessfully deleted
+				// Task was never started or was already successfully deleted
 				return
 			}
 			lc := t.(*Task)

vendor/github.com/containerd/containerd/plugin/plugin.go

@@ -89,7 +89,7 @@ type Registration struct {
 
 	// InitFn is called when initializing a plugin. The registration and
 	// context are passed in. The init function may modify the registration to
-	// add exports, capabilites and platform support declarations.
+	// add exports, capabilities and platform support declarations.
 	InitFn func(*InitContext) (interface{}, error)
 }
 

vendor/github.com/containerd/containerd/process.go

@@ -81,7 +81,7 @@ func (s ExitStatus) ExitTime() time.Time {
 	return s.exitedAt
 }
 
-// Error returns the error, if any, that occured while waiting for the
+// Error returns the error, if any, that occurred while waiting for the
 // process.
 func (s ExitStatus) Error() error {
 	return s.err

vendor/github.com/containerd/containerd/services/diff/local.go

@@ -34,7 +34,7 @@ type config struct {
 	// Order is the order of preference in which to try diff algorithms, the
 	// first differ which is supported is used.
 	// Note when multiple differs may be supported, this order will be
-	// respected for which is choosen. Each differ should return the same
+	// respected for which is chosen. Each differ should return the same
 	// correct output, allowing any ordering to be used to prefer
 	// more optimimal implementations.
 	Order []string `toml:"default"`