File 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-k... of Package docker

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch of Package docker (Revision e9f81d620990a18b195ed04304e8982f)

Currently displaying revision e9f81d620990a18b195ed04304e8982f , Show latest

From 4b6edb887a878a9637e9b3f434fa3f905543e1d1 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Mon, 22 May 2023 15:44:54 +1000
Subject: [PATCH 3/6] BUILD: SLE12: revert "graphdriver/btrfs: use kernel UAPI
 headers"

This reverts commit 3208dcabdc8997340b255f5b880fef4e3f54580d.

On SLE 12, our UAPI headers are too old, resulting in us being unable to
build the btrfs driver with the new headers. This patch is only needed
for SLE-12.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
---
 daemon/graphdriver/btrfs/btrfs.go | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go
index d88efc4be2..4e976aa689 100644
--- a/daemon/graphdriver/btrfs/btrfs.go
+++ b/daemon/graphdriver/btrfs/btrfs.go
@@ -5,17 +5,12 @@ package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
 
 /*
 #include <stdlib.h>
-#include <stdio.h>
 #include <dirent.h>
 
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)
-    #error "Headers from kernel >= 4.12 are required to build with Btrfs support."
-    #error "HINT: Set 'DOCKER_BUILDTAGS=exclude_graphdriver_btrfs' to build without Btrfs."
-#endif
-
-#include <linux/btrfs.h>
-#include <linux/btrfs_tree.h>
+// keep struct field name compatible with btrfs-progs < 6.1.
+#define max_referenced max_rfer
+#include <btrfs/ioctl.h>
+#include <btrfs/ctree.h>
 
 static void set_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* btrfs_struct, const char* value) {
     snprintf(btrfs_struct->name, BTRFS_SUBVOL_NAME_MAX, "%s", value);
-- 
2.43.0

Places

File 0003-BUILD-SLE12-revert-graphdriver-btrfs-use-kernel-UAPI.patch of Package docker (Revision e9f81d620990a18b195ed04304e8982f)

Places