From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 7 Aug 2022 14:45:30 +0000 (+0200)
Subject: block: Do not include linux/fs.h any more
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=81785c1b9a9c1b797e7406a3542c01d972c61315;p=project%2Ffstools.git

block: Do not include linux/fs.h any more

glibc 2.36 changed the definition of enum fsconfig_command in
sys/mount.h. This definition collides with the same definition from
linux/fs.h now. Remove the include of linux/fs.h. This compiles still
with musl too.

musl and glibc provide the defines linux/fs.h was included for in
sys/mount.h since some years.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/block.c b/block.c
index 3773a6e..40c52a0 100644
--- a/block.c
+++ b/block.c
@@ -33,8 +33,6 @@
 #include <sys/wait.h>
 #include <sys/sysmacros.h>
 
-#include <linux/fs.h>
-
 #include <uci.h>
 #include <uci_blob.h>