Replace os.Is* error checking functions with their errors.Is counterpart

curdbecker · curdbecker · commit 19f9fc3126ce · 2025-12-09T13:34:49.000+01:00
Signed-off-by: Curd Becker &lt;me@curd-becker.de&gt;
diff --git a/libcontainer/configs/validate/validator.go b/libcontainer/configs/validate/validator.go
@@ -142,7 +142,7 @@ func security(config *configs.Config) error {
 
 func namespaces(config *configs.Config) error {
 	if config.Namespaces.Contains(configs.NEWUSER) {
-		if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {
+		if _, err := os.Stat("/proc/self/ns/user"); errors.Is(err, os.ErrNotExist) {
 			return errors.New("user namespaces aren't enabled in the kernel")
 		}
 		hasPath := config.Namespaces.PathOf(configs.NEWUSER) != ""
@@ -160,13 +160,13 @@ func namespaces(config *configs.Config) error {
 	}
 
 	if config.Namespaces.Contains(configs.NEWCGROUP) {
-		if _, err := os.Stat("/proc/self/ns/cgroup"); os.IsNotExist(err) {
+		if _, err := os.Stat("/proc/self/ns/cgroup"); errors.Is(err, os.ErrNotExist) {
 			return errors.New("cgroup namespaces aren't enabled in the kernel")
 		}
 	}
 
 	if config.Namespaces.Contains(configs.NEWTIME) {
-		if _, err := os.Stat("/proc/self/timens_offsets"); os.IsNotExist(err) {
+		if _, err := os.Stat("/proc/self/timens_offsets"); errors.Is(err, os.ErrNotExist) {
 			return errors.New("time namespaces aren't enabled in the kernel")
 		}
 		hasPath := config.Namespaces.PathOf(configs.NEWTIME) != ""
diff --git a/libcontainer/configs/validate/validator_test.go b/libcontainer/configs/validate/validator_test.go
@@ -1,6 +1,7 @@
 package validate
 
 import (
+	"errors"
 	"os"
 	"path/filepath"
 	"strings"
@@ -172,7 +173,7 @@ func TestValidateSecurityWithoutNEWNS(t *testing.T) {
 }
 
 func TestValidateUserNamespace(t *testing.T) {
-	if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {
+	if _, err := os.Stat("/proc/self/ns/user"); errors.Is(err, os.ErrNotExist) {
 		t.Skip("Test requires userns.")
 	}
 	config := &configs.Config{
@@ -206,7 +207,7 @@ func TestValidateUsernsMappingWithoutNamespace(t *testing.T) {
 }
 
 func TestValidateTimeNamespace(t *testing.T) {
-	if _, err := os.Stat("/proc/self/ns/time"); os.IsNotExist(err) {
+	if _, err := os.Stat("/proc/self/ns/time"); errors.Is(err, os.ErrNotExist) {
 		t.Skip("Test requires timens.")
 	}
 	config := &configs.Config{
@@ -225,7 +226,7 @@ func TestValidateTimeNamespace(t *testing.T) {
 }
 
 func TestValidateTimeNamespaceWithBothPathAndTimeOffset(t *testing.T) {
-	if _, err := os.Stat("/proc/self/ns/time"); os.IsNotExist(err) {
+	if _, err := os.Stat("/proc/self/ns/time"); errors.Is(err, os.ErrNotExist) {
 		t.Skip("Test requires timens.")
 	}
 	config := &configs.Config{
@@ -1020,7 +1021,7 @@ func TestValidateNetDevices(t *testing.T) {
 }
 
 func TestValidateUserSysctlWithUserNamespace(t *testing.T) {
-	if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {
+	if _, err := os.Stat("/proc/self/ns/user"); errors.Is(err, os.ErrNotExist) {
 		t.Skip("Test requires userns.")
 	}
 	config := &configs.Config{
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
@@ -295,7 +295,7 @@ func handleFifoResult(result openResult) error {
 		return err
 	}
 	err := os.Remove(f.Name())
-	if err == nil || os.IsNotExist(err) {
+	if err == nil || errors.Is(err, os.ErrNotExist) {
 		return nil
 	}
 	return err
diff --git a/libcontainer/criu_linux.go b/libcontainer/criu_linux.go
@@ -125,7 +125,7 @@ func (c *Container) addMaskPaths(req *criurpc.CriuReq) error {
 	for _, path := range c.config.MaskPaths {
 		fi, err := os.Stat(fmt.Sprintf("/proc/%d/root/%s", c.initProcess.pid(), path))
 		if err != nil {
-			if os.IsNotExist(err) {
+			if errors.Is(err, os.ErrNotExist) {
 				continue
 			}
 			return err
@@ -318,7 +318,7 @@ func (c *Container) Checkpoint(criuOpts *CriuOpts) error {
 
 	// Since a container can be C/R'ed multiple times,
 	// the checkpoint directory may already exist.
-	if err := os.Mkdir(criuOpts.ImagesDirectory, 0o700); err != nil && !os.IsExist(err) {
+	if err := os.Mkdir(criuOpts.ImagesDirectory, 0o700); err != nil && !errors.Is(err, os.ErrExist) {
 		return err
 	}
 
@@ -353,7 +353,7 @@ func (c *Container) Checkpoint(criuOpts *CriuOpts) error {
 
 	// if criuOpts.WorkDirectory is not set, criu default is used.
 	if criuOpts.WorkDirectory != "" {
-		if err := os.Mkdir(criuOpts.WorkDirectory, 0o700); err != nil && !os.IsExist(err) {
+		if err := os.Mkdir(criuOpts.WorkDirectory, 0o700); err != nil && !errors.Is(err, os.ErrExist) {
 			return err
 		}
 		workDir, err := os.Open(criuOpts.WorkDirectory)
@@ -718,7 +718,7 @@ func (c *Container) Restore(process *Process, criuOpts *CriuOpts) error {
 	if criuOpts.WorkDirectory != "" {
 		// Since a container can be C/R'ed multiple times,
 		// the work directory may already exist.
-		if err := os.Mkdir(criuOpts.WorkDirectory, 0o700); err != nil && !os.IsExist(err) {
+		if err := os.Mkdir(criuOpts.WorkDirectory, 0o700); err != nil && !errors.Is(err, os.ErrExist) {
 			return err
 		}
 		workDir, err := os.Open(criuOpts.WorkDirectory)
@@ -1169,7 +1169,7 @@ func (c *Container) criuNotifications(resp *criurpc.CriuResp, process *Process,
 			return err
 		}
 		if err := os.Remove(filepath.Join(c.stateDir, "checkpoint")); err != nil {
-			if !os.IsNotExist(err) {
+			if !errors.Is(err, os.ErrNotExist) {
 				logrus.Error(err)
 			}
 		}
diff --git a/libcontainer/devices/device_unix.go b/libcontainer/devices/device_unix.go
@@ -98,7 +98,7 @@ func GetDevices(path string) ([]*Device, error) {
 			if errors.Is(err, ErrNotADevice) {
 				continue
 			}
-			if os.IsNotExist(err) {
+			if errors.Is(err, os.ErrNotExist) {
 				continue
 			}
 			return nil, err
diff --git a/libcontainer/factory_linux.go b/libcontainer/factory_linux.go
@@ -51,7 +51,7 @@ func Create(root, id string, config *configs.Config) (*Container, error) {
 	}
 	if _, err := os.Stat(stateDir); err == nil {
 		return nil, ErrExist
-	} else if !os.IsNotExist(err) {
+	} else if !errors.Is(err, os.ErrNotExist) {
 		return nil, err
 	}
 
@@ -154,7 +154,7 @@ func loadState(root string) (*State, error) {
 	}
 	f, err := os.Open(stateFilePath)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, os.ErrNotExist) {
 			return nil, ErrNotExist
 		}
 		return nil, err
diff --git a/libcontainer/integration/exec_test.go b/libcontainer/integration/exec_test.go
@@ -3,6 +3,7 @@ package integration
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -1093,7 +1094,7 @@ func TestHook(t *testing.T) {
 
 	for _, hook := range []string{"prestart", "createRuntime", "poststart"} {
 		fi, err := os.Stat(filepath.Join(config.Rootfs, hook))
-		if err == nil || !os.IsNotExist(err) {
+		if err == nil || !errors.Is(err, os.ErrNotExist) {
 			t.Fatalf("expected file '%s to not exists, but it does", fi.Name())
 		}
 	}
@@ -1637,7 +1638,7 @@ func TestTmpfsCopyUp(t *testing.T) {
 }
 
 func TestCGROUPPrivate(t *testing.T) {
-	if _, err := os.Stat("/proc/self/ns/cgroup"); os.IsNotExist(err) {
+	if _, err := os.Stat("/proc/self/ns/cgroup"); errors.Is(err, os.ErrNotExist) {
 		t.Skip("Test requires cgroupns.")
 	}
 	if testing.Short() {
@@ -1657,7 +1658,7 @@ func TestCGROUPPrivate(t *testing.T) {
 }
 
 func TestCGROUPHost(t *testing.T) {
-	if _, err := os.Stat("/proc/self/ns/cgroup"); os.IsNotExist(err) {
+	if _, err := os.Stat("/proc/self/ns/cgroup"); errors.Is(err, os.ErrNotExist) {
 		t.Skip("Test requires cgroupns.")
 	}
 	if testing.Short() {
diff --git a/libcontainer/intelrdt/intelrdt.go b/libcontainer/intelrdt/intelrdt.go
@@ -460,7 +460,7 @@ func (m *Manager) Apply(pid int) (err error) {
 		}
 	}
 
-	if err := os.Mkdir(path, 0o755); err != nil && !os.IsExist(err) {
+	if err := os.Mkdir(path, 0o755); err != nil && !errors.Is(err, os.ErrExist) {
 		return newLastCmdError(err)
 	}
 
@@ -470,7 +470,7 @@ func (m *Manager) Apply(pid int) (err error) {
 
 	// Create MON group
 	if monPath := m.GetMonPath(); monPath != "" {
-		if err := os.Mkdir(monPath, 0o755); err != nil && !os.IsExist(err) {
+		if err := os.Mkdir(monPath, 0o755); err != nil && !errors.Is(err, os.ErrExist) {
 			return newLastCmdError(err)
 		}
 		if err := WriteIntelRdtTasks(monPath, pid); err != nil {
@@ -493,14 +493,14 @@ func (m *Manager) Destroy() error {
 	if m.config.IntelRdt.ClosID == "" {
 		m.mu.Lock()
 		defer m.mu.Unlock()
-		if err := os.Remove(m.GetPath()); err != nil && !os.IsNotExist(err) {
+		if err := os.Remove(m.GetPath()); err != nil && !errors.Is(err, os.ErrNotExist) {
 			return err
 		}
 		m.path = ""
 	} else if monPath := m.GetMonPath(); monPath != "" {
 		// If ClosID is not specified the possible monintoring group was
 		// removed with the CLOS above.
-		if err := os.Remove(monPath); err != nil && !os.IsNotExist(err) {
+		if err := os.Remove(monPath); err != nil && !errors.Is(err, os.ErrNotExist) {
 			return err
 		}
 	}
diff --git a/libcontainer/notify_linux.go b/libcontainer/notify_linux.go
@@ -51,7 +51,7 @@ func registerMemoryEvent(cgDir, evName, arg string) (<-chan struct{}, error) {
 			}
 			// When a cgroup is destroyed, an event is sent to eventfd.
 			// So if the control path is gone, return instead of notifying.
-			if _, err := os.Lstat(eventControlPath); os.IsNotExist(err) {
+			if _, err := os.Lstat(eventControlPath); errors.Is(err, os.ErrNotExist) {
 				return
 			}
 			ch <- struct{}{}
diff --git a/libcontainer/process_linux.go b/libcontainer/process_linux.go
@@ -1103,7 +1103,7 @@ func getPipeFds(pid int) ([]string, error) {
 			// Ignore permission errors, for rootless containers and other
 			// non-dumpable processes. if we can't get the fd for a particular
 			// file, there's not much we can do.
-			if os.IsPermission(err) {
+			if errors.Is(err, os.ErrPermission) {
 				continue
 			}
 			return fds, err
diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go
@@ -364,7 +364,7 @@ func mountCgroupV1(m mountEntry, c *mountConfig) error {
 			// symlink(2) is very dumb, it will just shove the path into
 			// the link and doesn't do any checks or relative path
 			// conversion. Also, don't error out if the cgroup already exists.
-			if err := os.Symlink(mc, filepath.Join(c.root, m.Destination, ss)); err != nil && !os.IsExist(err) {
+			if err := os.Symlink(mc, filepath.Join(c.root, m.Destination, ss)); err != nil && !errors.Is(err, os.ErrExist) {
 				return err
 			}
 		}
@@ -602,7 +602,7 @@ func mountToRootfs(c *mountConfig, m mountEntry) error {
 			return err
 		}
 		if fi, err := os.Lstat(dest); err != nil {
-			if !os.IsNotExist(err) {
+			if !errors.Is(err, os.ErrNotExist) {
 				return err
 			}
 		} else if !fi.IsDir() {
@@ -899,7 +899,7 @@ func setupDevSymlinks(rootfs string) error {
 			src = link[0]
 			dst = filepath.Join(rootfs, link[1])
 		)
-		if err := os.Symlink(src, dst); err != nil && !os.IsExist(err) {
+		if err := os.Symlink(src, dst); err != nil && !errors.Is(err, os.ErrExist) {
 			return err
 		}
 	}
@@ -1109,7 +1109,7 @@ func setReadonly() error {
 
 func setupPtmx(config *configs.Config) error {
 	ptmx := filepath.Join(config.Rootfs, "dev/ptmx")
-	if err := os.Remove(ptmx); err != nil && !os.IsNotExist(err) {
+	if err := os.Remove(ptmx); err != nil && !errors.Is(err, os.ErrNotExist) {
 		return err
 	}
 	if err := os.Symlink("pts/ptmx", ptmx); err != nil {
diff --git a/libcontainer/specconv/spec_linux_test.go b/libcontainer/specconv/spec_linux_test.go
@@ -1,6 +1,7 @@
 package specconv
 
 import (
+	"errors"
 	"os"
 	"strings"
 	"testing"
@@ -609,7 +610,7 @@ func TestDupNamespaces(t *testing.T) {
 }
 
 func TestUserNamespaceMappingAndPath(t *testing.T) {
-	if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {
+	if _, err := os.Stat("/proc/self/ns/user"); errors.Is(err, os.ErrNotExist) {
 		t.Skip("Test requires userns.")
 	}
 
@@ -643,7 +644,7 @@ func TestUserNamespaceMappingAndPath(t *testing.T) {
 }
 
 func TestNonZeroEUIDCompatibleSpecconvValidate(t *testing.T) {
-	if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {
+	if _, err := os.Stat("/proc/self/ns/user"); errors.Is(err, os.ErrNotExist) {
 		t.Skip("Test requires userns.")
 	}
 
diff --git a/libcontainer/state_linux.go b/libcontainer/state_linux.go
@@ -1,6 +1,7 @@
 package libcontainer
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -213,7 +214,7 @@ func (r *restoredState) transition(s containerState) error {
 
 func (r *restoredState) destroy() error {
 	if _, err := os.Stat(filepath.Join(r.c.stateDir, "checkpoint")); err != nil {
-		if !os.IsNotExist(err) {
+		if !errors.Is(err, os.ErrNotExist) {
 			return err
 		}
 	}
diff --git a/spec.go b/spec.go
@@ -91,7 +91,7 @@ created by an unprivileged user.
 			if err == nil {
 				return fmt.Errorf("File %s exists. Remove it first", name)
 			}
-			if !os.IsNotExist(err) {
+			if !errors.Is(err, os.ErrNotExist) {
 				return err
 			}
 			return nil
@@ -117,7 +117,7 @@ created by an unprivileged user.
 func loadSpec(cPath string) (spec *specs.Spec, err error) {
 	cf, err := os.Open(cPath)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, os.ErrNotExist) {
 			return nil, fmt.Errorf("JSON specification file %s not found", cPath)
 		}
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ func security(config *configs.Config) error {`
`142`	`142`
`143`	`143`	`func namespaces(config *configs.Config) error {`
`144`	`144`	`if config.Namespaces.Contains(configs.NEWUSER) {`
`145`		`- if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {`
	`145`	`+ if _, err := os.Stat("/proc/self/ns/user"); errors.Is(err, os.ErrNotExist) {`
`146`	`146`	`return errors.New("user namespaces aren't enabled in the kernel")`
`147`	`147`	`}`
`148`	`148`	`hasPath := config.Namespaces.PathOf(configs.NEWUSER) != ""`
`@@ -160,13 +160,13 @@ func namespaces(config *configs.Config) error {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`if config.Namespaces.Contains(configs.NEWCGROUP) {`
`163`		`- if _, err := os.Stat("/proc/self/ns/cgroup"); os.IsNotExist(err) {`
	`163`	`+ if _, err := os.Stat("/proc/self/ns/cgroup"); errors.Is(err, os.ErrNotExist) {`
`164`	`164`	`return errors.New("cgroup namespaces aren't enabled in the kernel")`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`if config.Namespaces.Contains(configs.NEWTIME) {`
`169`		`- if _, err := os.Stat("/proc/self/timens_offsets"); os.IsNotExist(err) {`
	`169`	`+ if _, err := os.Stat("/proc/self/timens_offsets"); errors.Is(err, os.ErrNotExist) {`
`170`	`170`	`return errors.New("time namespaces aren't enabled in the kernel")`
`171`	`171`	`}`
`172`	`172`	`hasPath := config.Namespaces.PathOf(configs.NEWTIME) != ""`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package validate`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "errors"`
`4`	`5`	`"os"`
`5`	`6`	`"path/filepath"`
`6`	`7`	`"strings"`
`@@ -172,7 +173,7 @@ func TestValidateSecurityWithoutNEWNS(t *testing.T) {`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`func TestValidateUserNamespace(t *testing.T) {`
`175`		`- if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {`
	`176`	`+ if _, err := os.Stat("/proc/self/ns/user"); errors.Is(err, os.ErrNotExist) {`
`176`	`177`	`t.Skip("Test requires userns.")`
`177`	`178`	`}`
`178`	`179`	`config := &configs.Config{`
`@@ -206,7 +207,7 @@ func TestValidateUsernsMappingWithoutNamespace(t *testing.T) {`
`206`	`207`	`}`
`207`	`208`
`208`	`209`	`func TestValidateTimeNamespace(t *testing.T) {`
`209`		`- if _, err := os.Stat("/proc/self/ns/time"); os.IsNotExist(err) {`
	`210`	`+ if _, err := os.Stat("/proc/self/ns/time"); errors.Is(err, os.ErrNotExist) {`
`210`	`211`	`t.Skip("Test requires timens.")`
`211`	`212`	`}`
`212`	`213`	`config := &configs.Config{`
`@@ -225,7 +226,7 @@ func TestValidateTimeNamespace(t *testing.T) {`
`225`	`226`	`}`
`226`	`227`
`227`	`228`	`func TestValidateTimeNamespaceWithBothPathAndTimeOffset(t *testing.T) {`
`228`		`- if _, err := os.Stat("/proc/self/ns/time"); os.IsNotExist(err) {`
	`229`	`+ if _, err := os.Stat("/proc/self/ns/time"); errors.Is(err, os.ErrNotExist) {`
`229`	`230`	`t.Skip("Test requires timens.")`
`230`	`231`	`}`
`231`	`232`	`config := &configs.Config{`
`@@ -1020,7 +1021,7 @@ func TestValidateNetDevices(t *testing.T) {`
`1020`	`1021`	`}`
`1021`	`1022`
`1022`	`1023`	`func TestValidateUserSysctlWithUserNamespace(t *testing.T) {`
`1023`		`- if _, err := os.Stat("/proc/self/ns/user"); os.IsNotExist(err) {`
	`1024`	`+ if _, err := os.Stat("/proc/self/ns/user"); errors.Is(err, os.ErrNotExist) {`
`1024`	`1025`	`t.Skip("Test requires userns.")`
`1025`	`1026`	`}`
`1026`	`1027`	`config := &configs.Config{`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ func handleFifoResult(result openResult) error {`
`295`	`295`	`return err`
`296`	`296`	`}`
`297`	`297`	`err := os.Remove(f.Name())`
`298`		`- if err == nil \|\| os.IsNotExist(err) {`
	`298`	`+ if err == nil \|\| errors.Is(err, os.ErrNotExist) {`
`299`	`299`	`return nil`
`300`	`300`	`}`
`301`	`301`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (c Container) addMaskPaths(req criurpc.CriuReq) error {`
`125`	`125`	`for _, path := range c.config.MaskPaths {`
`126`	`126`	`fi, err := os.Stat(fmt.Sprintf("/proc/%d/root/%s", c.initProcess.pid(), path))`
`127`	`127`	`if err != nil {`
`128`		`- if os.IsNotExist(err) {`
	`128`	`+ if errors.Is(err, os.ErrNotExist) {`
`129`	`129`	`continue`
`130`	`130`	`}`
`131`	`131`	`return err`
`@@ -318,7 +318,7 @@ func (c Container) Checkpoint(criuOpts CriuOpts) error {`
`318`	`318`
`319`	`319`	`// Since a container can be C/R'ed multiple times,`
`320`	`320`	`// the checkpoint directory may already exist.`
`321`		`- if err := os.Mkdir(criuOpts.ImagesDirectory, 0o700); err != nil && !os.IsExist(err) {`
	`321`	`+ if err := os.Mkdir(criuOpts.ImagesDirectory, 0o700); err != nil && !errors.Is(err, os.ErrExist) {`
`322`	`322`	`return err`
`323`	`323`	`}`
`324`	`324`
`@@ -353,7 +353,7 @@ func (c Container) Checkpoint(criuOpts CriuOpts) error {`
`353`	`353`
`354`	`354`	`// if criuOpts.WorkDirectory is not set, criu default is used.`
`355`	`355`	`if criuOpts.WorkDirectory != "" {`
`356`		`- if err := os.Mkdir(criuOpts.WorkDirectory, 0o700); err != nil && !os.IsExist(err) {`
	`356`	`+ if err := os.Mkdir(criuOpts.WorkDirectory, 0o700); err != nil && !errors.Is(err, os.ErrExist) {`
`357`	`357`	`return err`
`358`	`358`	`}`
`359`	`359`	`workDir, err := os.Open(criuOpts.WorkDirectory)`
`@@ -718,7 +718,7 @@ func (c Container) Restore(process Process, criuOpts *CriuOpts) error {`
`718`	`718`	`if criuOpts.WorkDirectory != "" {`
`719`	`719`	`// Since a container can be C/R'ed multiple times,`
`720`	`720`	`// the work directory may already exist.`
`721`		`- if err := os.Mkdir(criuOpts.WorkDirectory, 0o700); err != nil && !os.IsExist(err) {`
	`721`	`+ if err := os.Mkdir(criuOpts.WorkDirectory, 0o700); err != nil && !errors.Is(err, os.ErrExist) {`
`722`	`722`	`return err`
`723`	`723`	`}`
`724`	`724`	`workDir, err := os.Open(criuOpts.WorkDirectory)`
`@@ -1169,7 +1169,7 @@ func (c Container) criuNotifications(resp criurpc.CriuResp, process *Process,`
`1169`	`1169`	`return err`
`1170`	`1170`	`}`
`1171`	`1171`	`if err := os.Remove(filepath.Join(c.stateDir, "checkpoint")); err != nil {`
`1172`		`- if !os.IsNotExist(err) {`
	`1172`	`+ if !errors.Is(err, os.ErrNotExist) {`
`1173`	`1173`	`logrus.Error(err)`
`1174`	`1174`	`}`
`1175`	`1175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func GetDevices(path string) ([]*Device, error) {`
`98`	`98`	`if errors.Is(err, ErrNotADevice) {`
`99`	`99`	`continue`
`100`	`100`	`}`
`101`		`- if os.IsNotExist(err) {`
	`101`	`+ if errors.Is(err, os.ErrNotExist) {`
`102`	`102`	`continue`
`103`	`103`	`}`
`104`	`104`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func Create(root, id string, config configs.Config) (Container, error) {`
`51`	`51`	`}`
`52`	`52`	`if _, err := os.Stat(stateDir); err == nil {`
`53`	`53`	`return nil, ErrExist`
`54`		`- } else if !os.IsNotExist(err) {`
	`54`	`+ } else if !errors.Is(err, os.ErrNotExist) {`
`55`	`55`	`return nil, err`
`56`	`56`	`}`
`57`	`57`
`@@ -154,7 +154,7 @@ func loadState(root string) (*State, error) {`
`154`	`154`	`}`
`155`	`155`	`f, err := os.Open(stateFilePath)`
`156`	`156`	`if err != nil {`
`157`		`- if os.IsNotExist(err) {`
	`157`	`+ if errors.Is(err, os.ErrNotExist) {`
`158`	`158`	`return nil, ErrNotExist`
`159`	`159`	`}`
`160`	`160`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package integration`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"encoding/json"`
	`6`	`+ "errors"`
`6`	`7`	`"fmt"`
`7`	`8`	`"os"`
`8`	`9`	`"os/exec"`
`@@ -1093,7 +1094,7 @@ func TestHook(t *testing.T) {`
`1093`	`1094`
`1094`	`1095`	`for _, hook := range []string{"prestart", "createRuntime", "poststart"} {`
`1095`	`1096`	`fi, err := os.Stat(filepath.Join(config.Rootfs, hook))`
`1096`		`- if err == nil \|\| !os.IsNotExist(err) {`
	`1097`	`+ if err == nil \|\| !errors.Is(err, os.ErrNotExist) {`
`1097`	`1098`	`t.Fatalf("expected file '%s to not exists, but it does", fi.Name())`
`1098`	`1099`	`}`
`1099`	`1100`	`}`
`@@ -1637,7 +1638,7 @@ func TestTmpfsCopyUp(t *testing.T) {`
`1637`	`1638`	`}`
`1638`	`1639`
`1639`	`1640`	`func TestCGROUPPrivate(t *testing.T) {`
`1640`		`- if _, err := os.Stat("/proc/self/ns/cgroup"); os.IsNotExist(err) {`
	`1641`	`+ if _, err := os.Stat("/proc/self/ns/cgroup"); errors.Is(err, os.ErrNotExist) {`
`1641`	`1642`	`t.Skip("Test requires cgroupns.")`
`1642`	`1643`	`}`
`1643`	`1644`	`if testing.Short() {`
`@@ -1657,7 +1658,7 @@ func TestCGROUPPrivate(t *testing.T) {`
`1657`	`1658`	`}`
`1658`	`1659`
`1659`	`1660`	`func TestCGROUPHost(t *testing.T) {`
`1660`		`- if _, err := os.Stat("/proc/self/ns/cgroup"); os.IsNotExist(err) {`
	`1661`	`+ if _, err := os.Stat("/proc/self/ns/cgroup"); errors.Is(err, os.ErrNotExist) {`
`1661`	`1662`	`t.Skip("Test requires cgroupns.")`
`1662`	`1663`	`}`
`1663`	`1664`	`if testing.Short() {`
Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ func (m *Manager) Apply(pid int) (err error) {`
`460`	`460`	`}`
`461`	`461`	`}`
`462`	`462`
`463`		`- if err := os.Mkdir(path, 0o755); err != nil && !os.IsExist(err) {`
	`463`	`+ if err := os.Mkdir(path, 0o755); err != nil && !errors.Is(err, os.ErrExist) {`
`464`	`464`	`return newLastCmdError(err)`
`465`	`465`	`}`
`466`	`466`
`@@ -470,7 +470,7 @@ func (m *Manager) Apply(pid int) (err error) {`
`470`	`470`
`471`	`471`	`// Create MON group`
`472`	`472`	`if monPath := m.GetMonPath(); monPath != "" {`
`473`		`- if err := os.Mkdir(monPath, 0o755); err != nil && !os.IsExist(err) {`
	`473`	`+ if err := os.Mkdir(monPath, 0o755); err != nil && !errors.Is(err, os.ErrExist) {`
`474`	`474`	`return newLastCmdError(err)`
`475`	`475`	`}`
`476`	`476`	`if err := WriteIntelRdtTasks(monPath, pid); err != nil {`
`@@ -493,14 +493,14 @@ func (m *Manager) Destroy() error {`
`493`	`493`	`if m.config.IntelRdt.ClosID == "" {`
`494`	`494`	`m.mu.Lock()`
`495`	`495`	`defer m.mu.Unlock()`
`496`		`- if err := os.Remove(m.GetPath()); err != nil && !os.IsNotExist(err) {`
	`496`	`+ if err := os.Remove(m.GetPath()); err != nil && !errors.Is(err, os.ErrNotExist) {`
`497`	`497`	`return err`
`498`	`498`	`}`
`499`	`499`	`m.path = ""`
`500`	`500`	`} else if monPath := m.GetMonPath(); monPath != "" {`
`501`	`501`	`// If ClosID is not specified the possible monintoring group was`
`502`	`502`	`// removed with the CLOS above.`
`503`		`- if err := os.Remove(monPath); err != nil && !os.IsNotExist(err) {`
	`503`	`+ if err := os.Remove(monPath); err != nil && !errors.Is(err, os.ErrNotExist) {`
`504`	`504`	`return err`
`505`	`505`	`}`
`506`	`506`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func registerMemoryEvent(cgDir, evName, arg string) (<-chan struct{}, error) {`
`51`	`51`	`}`
`52`	`52`	`// When a cgroup is destroyed, an event is sent to eventfd.`
`53`	`53`	`// So if the control path is gone, return instead of notifying.`
`54`		`- if _, err := os.Lstat(eventControlPath); os.IsNotExist(err) {`
	`54`	`+ if _, err := os.Lstat(eventControlPath); errors.Is(err, os.ErrNotExist) {`
`55`	`55`	`return`
`56`	`56`	`}`
`57`	`57`	`ch <- struct{}{}`
Original file line number	Diff line number	Diff line change
`@@ -1103,7 +1103,7 @@ func getPipeFds(pid int) ([]string, error) {`
`1103`	`1103`	`// Ignore permission errors, for rootless containers and other`
`1104`	`1104`	`// non-dumpable processes. if we can't get the fd for a particular`
`1105`	`1105`	`// file, there's not much we can do.`
`1106`		`- if os.IsPermission(err) {`
	`1106`	`+ if errors.Is(err, os.ErrPermission) {`
`1107`	`1107`	`continue`
`1108`	`1108`	`}`
`1109`	`1109`	`return fds, err`