diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go index f2f6bf9e97..335d53b0f7 100644 --- a/daemon/graphdriver/btrfs/btrfs.go +++ b/daemon/graphdriver/btrfs/btrfs.go @@ -150,18 +150,11 @@ func (d *Driver) String() string { return "btrfs" } -// Status returns current driver information in a two dimensional string array. -// Output contains "Build Version" and "Library Version" of the btrfs libraries used. -// Version information can be used to check compatibility with your kernel. +// Status returns the status of the driver. func (d *Driver) Status() [][2]string { - status := [][2]string{} - if bv := btrfsBuildVersion(); bv != "-" { - status = append(status, [2]string{"Build Version", bv}) + return [][2]string{ + {"Btrfs", ""}, } - if lv := btrfsLibVersion(); lv != -1 { - status = append(status, [2]string{"Library Version", strconv.Itoa(lv)}) - } - return status } // GetMetadata returns empty metadata for this driver. diff --git a/daemon/graphdriver/btrfs/version.go b/daemon/graphdriver/btrfs/version.go deleted file mode 100644 index 635e976813..0000000000 --- a/daemon/graphdriver/btrfs/version.go +++ /dev/null @@ -1,27 +0,0 @@ -//go:build linux -// +build linux - -package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs" - -/* -#include - -// around version 3.16, they did not define lib version yet -#ifndef BTRFS_LIB_VERSION -#define BTRFS_LIB_VERSION -1 -#endif - -// upstream had removed it, but now it will be coming back -#ifndef BTRFS_BUILD_VERSION -#define BTRFS_BUILD_VERSION "-" -#endif -*/ -import "C" - -func btrfsBuildVersion() string { - return string(C.BTRFS_BUILD_VERSION) -} - -func btrfsLibVersion() int { - return int(C.BTRFS_LIB_VERSION) -} diff --git a/daemon/graphdriver/btrfs/version_test.go b/daemon/graphdriver/btrfs/version_test.go deleted file mode 100644 index 0f8652f0de..0000000000 --- a/daemon/graphdriver/btrfs/version_test.go +++ /dev/null @@ -1,14 +0,0 @@ -//go:build linux -// +build linux - -package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs" - -import ( - "testing" -) - -func TestLibVersion(t *testing.T) { - if btrfsLibVersion() <= 0 { - t.Error("expected output from btrfs lib version > 0") - } -}