From 970fea45e3834fb139f76fa06640e63b32d149dd Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 31 Jul 2017 19:59:48 -0700 Subject: [PATCH 1/2] graphdriver/devmapper: clarify a message Make sure user understands this is about the in-kernel driver (not the dockerd driver or smth). While at it, amend the comment as well. Signed-off-by: Kir Kolyshkin Upstream-commit: aab2450e25b397d38cdcb5e173ef1121283196c2 Component: engine --- .../engine/daemon/graphdriver/devmapper/deviceset.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/components/engine/daemon/graphdriver/devmapper/deviceset.go b/components/engine/daemon/graphdriver/devmapper/deviceset.go index 906daf639b..25d7da216d 100644 --- a/components/engine/daemon/graphdriver/devmapper/deviceset.go +++ b/components/engine/daemon/graphdriver/devmapper/deviceset.go @@ -1479,12 +1479,9 @@ func (devices *DeviceSet) closeTransaction() error { } func determineDriverCapabilities(version string) error { - /* - * Driver version 4.27.0 and greater support deferred activation - * feature. - */ + // Kernel driver version >= 4.27.0 support deferred removal - logrus.Debugf("devicemapper: driver version is %s", version) + logrus.Debugf("devicemapper: kernel dm driver version is %s", version) versionSplit := strings.Split(version, ".") major, err := strconv.Atoi(versionSplit[0]) From 13250b8fde5e2b5926898002d819aeaf48c69548 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 31 Jul 2017 20:03:09 -0700 Subject: [PATCH 2/2] pkg/devicemapper: comment nitpicks 1. devmapper_wrapper_{,no_}deferred_remove.go: Comments about LibraryDeferredRemovalSupport were very totally misleading to me. This thing has nothing to do with either static or dynamic linking (but with build tags). Fix the comment accordingly. 2. devmapper.go: Reveal the source of those magic device* constants. Signed-off-by: Kir Kolyshkin Upstream-commit: adce3ca48e306a6117ce5677b8d9437551e98a26 Component: engine --- components/engine/pkg/devicemapper/devmapper.go | 1 + .../pkg/devicemapper/devmapper_wrapper_deferred_remove.go | 2 +- .../pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/pkg/devicemapper/devmapper.go b/components/engine/pkg/devicemapper/devmapper.go index f331970802..b6204f441f 100644 --- a/components/engine/pkg/devicemapper/devmapper.go +++ b/components/engine/pkg/devicemapper/devmapper.go @@ -13,6 +13,7 @@ import ( "golang.org/x/sys/unix" ) +// Same as DM_DEVICE_* enum values from libdevmapper.h const ( deviceCreate TaskType = iota deviceReload diff --git a/components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go b/components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go index 5bdd97d9c0..7e231ddcb8 100644 --- a/components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go +++ b/components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go @@ -8,7 +8,7 @@ package devicemapper */ import "C" -// LibraryDeferredRemovalSupport is supported when statically linked. +// LibraryDeferredRemovalSupport tells if the feature is enabled in the build const LibraryDeferredRemovalSupport = true func dmTaskDeferredRemoveFct(task *cdmTask) int { diff --git a/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go b/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go index 968b2ce0c0..a880fec8c4 100644 --- a/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go +++ b/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go @@ -2,7 +2,7 @@ package devicemapper -// LibraryDeferredRemovalSupport is not supported when statically linked. +// LibraryDeferredRemovalSupport tells if the feature is enabled in the build const LibraryDeferredRemovalSupport = false func dmTaskDeferredRemoveFct(task *cdmTask) int {