summaryrefslogtreecommitdiff
path: root/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch
blob: 52671ea6c3579f782db6a88d66fcab85e737c2c6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
https://github.com/kdave/btrfs-progs/commit/46eb32a019834b0a49ae9744db1a921aaa6a3d63

From 46eb32a019834b0a49ae9744db1a921aaa6a3d63 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 25 Jul 2022 11:58:35 -0700
Subject: [PATCH] btrfs-progs: use linux mount.h instead of sys/mount.h

This file includes linux/fs.h which includes linux/mount.h and with
glibc 2.36 linux/mount.h and glibc mount.h are not compatible [1]
therefore try to avoid including both headers

[1] https://sourceware.org/glibc/wiki/Release/2.36

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---
 common/device-utils.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/device-utils.c b/common/device-utils.c
index 617b67462..25a4fb8c4 100644
--- a/common/device-utils.c
+++ b/common/device-utils.c
@@ -15,7 +15,6 @@
  */
 
 #include <sys/ioctl.h>
-#include <sys/mount.h>
 #include <sys/statfs.h>
 #include <sys/types.h>
 #include <stdio.h>