From af266845642a66601eed6dd3aff99a11f2203ade Mon Sep 17 00:00:00 2001
From: Andrew Hsu <andrewhsu@docker.com>
Date: Tue, 11 Jul 2017 07:41:38 +0000
Subject: [PATCH] vndr to update vendor for github.com/Microsoft/go-winio

No changes to vendor.conf, just running vndr.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
---
 .../engine/vendor/github.com/Microsoft/go-winio/file.go   | 8 +++++---
 .../engine/vendor/github.com/Microsoft/go-winio/pipe.go   | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/components/engine/vendor/github.com/Microsoft/go-winio/file.go b/components/engine/vendor/github.com/Microsoft/go-winio/file.go
index 078a5687b6..613f31b520 100644
--- a/components/engine/vendor/github.com/Microsoft/go-winio/file.go
+++ b/components/engine/vendor/github.com/Microsoft/go-winio/file.go
@@ -124,7 +124,8 @@ func (f *win32File) Close() error {
 	return nil
 }
 
-// prepareIo prepares for a new IO operation
+// prepareIo prepares for a new IO operation.
+// The caller must call f.wg.Done() when the IO is finished, prior to Close() returning.
 func (f *win32File) prepareIo() (*ioOperation, error) {
 	f.wg.Add(1)
 	if f.closing {
@@ -155,7 +156,6 @@ func ioCompletionProcessor(h syscall.Handle) {
 // the operation has actually completed.
 func (f *win32File) asyncIo(c *ioOperation, d *deadlineHandler, bytes uint32, err error) (int, error) {
 	if err != syscall.ERROR_IO_PENDING {
-		f.wg.Done()
 		return int(bytes), err
 	}
 
@@ -192,7 +192,6 @@ func (f *win32File) asyncIo(c *ioOperation, d *deadlineHandler, bytes uint32, er
 	// code to ioCompletionProcessor, c must remain alive
 	// until the channel read is complete.
 	runtime.KeepAlive(c)
-	f.wg.Done()
 	return int(r.bytes), err
 }
 
@@ -202,6 +201,7 @@ func (f *win32File) Read(b []byte) (int, error) {
 	if err != nil {
 		return 0, err
 	}
+	defer f.wg.Done()
 
 	if f.readDeadline.timedout.isSet() {
 		return 0, ErrTimeout
@@ -228,6 +228,8 @@ func (f *win32File) Write(b []byte) (int, error) {
 	if err != nil {
 		return 0, err
 	}
+	defer f.wg.Done()
+
 	if f.writeDeadline.timedout.isSet() {
 		return 0, ErrTimeout
 	}
diff --git a/components/engine/vendor/github.com/Microsoft/go-winio/pipe.go b/components/engine/vendor/github.com/Microsoft/go-winio/pipe.go
index aa7e8eb0f8..da706cc8a7 100644
--- a/components/engine/vendor/github.com/Microsoft/go-winio/pipe.go
+++ b/components/engine/vendor/github.com/Microsoft/go-winio/pipe.go
@@ -360,6 +360,8 @@ func connectPipe(p *win32File) error {
 	if err != nil {
 		return err
 	}
+	defer p.wg.Done()
+
 	err = connectNamedPipe(p.handle, &c.o)
 	_, err = p.asyncIo(c, nil, 0, err)
 	if err != nil && err != cERROR_PIPE_CONNECTED {