From a8008f7313e6f9ad0b2d7e7a49d228f520469bc4 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 11 Mar 2021 15:18:59 +0900 Subject: [PATCH] overlayutils/userxattr.go: add "fast path" for kernel >= 5.11.0 Signed-off-by: Akihiro Suda --- daemon/graphdriver/overlayutils/userxattr.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/daemon/graphdriver/overlayutils/userxattr.go b/daemon/graphdriver/overlayutils/userxattr.go index 492560f1b5..7f19dcb7ed 100644 --- a/daemon/graphdriver/overlayutils/userxattr.go +++ b/daemon/graphdriver/overlayutils/userxattr.go @@ -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 {