Merge pull request #262 from dcantah/cg2-noretry-eintr

cgroup2: Don't retry on EINTR
containerd · Dec 31, 2022 · e91481e · e91481e
2 parents dd9a65f + 2b3be83
commit e91481e
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/cgroup2/manager.go b/cgroup2/manager.go
@@ -144,20 +144,11 @@ func (c *Value) write(path string, perm os.FileMode) error {
 		return ErrInvalidFormat
 	}
 
-	// Retry writes on EINTR; see:
-	//    https://github.com/golang/go/issues/38033
-	for {
-		err := os.WriteFile(
-			filepath.Join(path, c.filename),
-			data,
-			perm,
-		)
-		if err == nil {
-			return nil
-		} else if !errors.Is(err, syscall.EINTR) {
-			return err
-		}
-	}
+	return os.WriteFile(
+		filepath.Join(path, c.filename),
+		data,
+		perm,
+	)
 }
 
 func writeValues(path string, values []Value) error {