Merge pull request #2308 from Luap99/btrfs-noversion

dirvers/btrfs: remove btrfs_noversion tag
This commit is contained in:
openshift-merge-bot[bot] 2025-04-01 21:54:35 +00:00 committed by GitHub
commit 0b4d9cfd53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 23 deletions

View File

@ -1,4 +1,4 @@
//go:build linux && !btrfs_noversion && cgo
//go:build linux && cgo
package btrfs

View File

@ -1,14 +0,0 @@
//go:build linux && btrfs_noversion && cgo
package btrfs
// TODO(vbatts) remove this work-around once supported linux distros are on
// btrfs utilities of >= 3.16.1
func btrfsBuildVersion() string {
return "-"
}
func btrfsLibVersion() int {
return -1
}

View File

@ -1,4 +1,4 @@
//go:build linux && !btrfs_noversion && cgo
//go:build linux && cgo
package btrfs

View File

@ -7,11 +7,4 @@ cc -E - >/dev/null 2>/dev/null <<-EOF
EOF
if test $? -ne 0; then
echo exclude_graphdriver_btrfs
else
cc -E - >/dev/null 2>/dev/null <<-EOF
#include <btrfs/version.h>
EOF
if test $? -ne 0; then
echo btrfs_noversion
fi
fi