Merge pull request #332 from slp/docker-1.13.1-rhel

BACKPORT: Fix cpu spin waiting for log write events

Author: runcom

daemon/logger/jsonfilelog/read.go

@@ -271,9 +271,12 @@ func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan int
 
 	handleDecodeErr := func(err error) error {
 		if err == io.EOF {
-			for err := waitRead(); err != nil; {
+			for {
+				err := waitRead()
+				if err == nil {
+					break
+				}
 				if err == errRetry {
-					// retry the waitRead
 					continue
 				}
 				return err