blob: 2659e4696d61dad8aee502eefda480173593f275 [file] [log] [blame]
Patrick Williams92b42cb2022-09-03 06:53:57 -05001From 7d32c352f628747cfadabf9fe7fcc13608e5dfe6 Mon Sep 17 00:00:00 2001
2From: Colin Walters <walters@verbum.org>
3Date: Wed, 3 Aug 2022 10:37:40 -0400
4Subject: [PATCH] Remove unused `linux/fs.h` includes
5
6Prep for fixing conflicts introduced by newer glibc.
7cc https://github.com/ostreedev/ostree/issues/2685
8
9Upstream-Status: Backport [https://github.com/ostreedev/ostree/commit/edba4b33be10c05253bfa94895dfbc8477e44d76]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/libostree/ostree-repo-commit.c | 1 -
13 src/ostree/ot-main.c | 1 -
14 2 files changed, 2 deletions(-)
15
16diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
17index afab3fdf..35b16c71 100644
18--- a/src/libostree/ostree-repo-commit.c
19+++ b/src/libostree/ostree-repo-commit.c
20@@ -30,7 +30,6 @@
21 #include <sys/xattr.h>
22 #include <glib/gprintf.h>
23 #include <sys/ioctl.h>
24-#include <linux/fs.h>
25 #include <ext2fs/ext2_fs.h>
26
27 #include "otutil.h"
28diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
29index b7b50d67..7a4405a5 100644
30--- a/src/ostree/ot-main.c
31+++ b/src/ostree/ot-main.c
32@@ -28,7 +28,6 @@
33 #include <string.h>
34 #include <sys/statvfs.h>
35 #include <sys/mount.h>
36-#include <linux/fs.h>
37
38 #include "ot-main.h"
39 #include "ostree.h"
40--
412.37.1
42