overlayutils/userxattr.go: add "fast path" for kernel >= 5.11.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2021-03-11 15:18:59 +09:00
parent 11ef8d3ba9
commit a8008f7313
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
1 changed files with 6 additions and 2 deletions

View File

@ -27,6 +27,7 @@ import (
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/sys"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/sirupsen/logrus"
)
@ -56,10 +57,13 @@ func NeedsUserXAttr(d string) (bool, error) {
return false, nil
}
// TODO: add fast path for kernel >= 5.11 .
// Fast path for kernel >= 5.11 .
//
// Keep in mind that distro vendors might be going to backport the patch to older kernels.
// So we can't completely remove the check.
// So we can't completely remove the "slow path".
if kernel.CheckKernelVersion(5, 11, 0) {
return true, nil
}
tdRoot := filepath.Join(d, "userxattr-check")
if err := os.RemoveAll(tdRoot); err != nil {