Gitiles
Code Review Sign In
gerrit-dev.monogon.dev / monogon / 07a39e2b168871f7cc4d50e26a3a474c1fcd99b6 / . / third_party / xfsprogs / patches / bazel_cc_fix.patch
blob: 60fc66169037b673e9dda94883e932901291083b [file] [log] [blame]
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1From 141475429a100ff9b994002f1186705dce2e6657 Mon Sep 17 00:00:00 2001
2From: Lorenz Brun <lorenz@monogon.tech>
3Date: Wed, 21 Aug 2024 17:21:22 +0200
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]4Subject: [PATCH] bazel_cc_fix patch
5
6---
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]7 include/libxfs.h | 86 ++++++++++++++++++-------------------
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]8 include/linux.h | 2 +-
9 include/xfs.h | 8 ++--
10 include/xfs_inode.h | 4 +-
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]11 libfrog/avl64.c | 2 +-
12 libfrog/bitmap.c | 6 +--
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]13 libfrog/bulkstat.c | 2 +-
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]14 libfrog/convert.c | 4 +-
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]15 libfrog/crc32.c | 2 +-
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]16 libfrog/crc32cselftest.h | 2 +-
17 libfrog/dahashselftest.h | 2 +-
18 libfrog/fsgeom.c | 6 +--
19 libfrog/linux.c | 8 ++--
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]20 libfrog/list_sort.c | 2 +-
21 libfrog/paths.c | 2 +-
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]22 libfrog/paths.h | 2 +-
23 libfrog/projects.h | 4 +-
24 libfrog/ptvar.c | 2 +-
25 libfrog/radix-tree.c | 2 +-
26 libfrog/randbytes.c | 4 +-
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]27 libfrog/scrub.c | 2 +-
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]28 libfrog/util.c | 2 +-
29 libxcmd/command.c | 6 +--
30 libxcmd/help.c | 6 +--
31 libxcmd/input.c | 4 +-
32 libxcmd/quit.c | 6 +--
33 libxfs/buf_mem.c | 6 +--
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]34 libxfs/cache.c | 2 +-
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]35 libxfs/defer_item.c | 8 ++--
36 libxfs/init.c | 12 +++---
37 libxfs/libxfs_priv.h | 22 +++++-----
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]38 libxfs/logitem.c | 6 +--
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]39 libxfs/rdwr.c | 12 +++---
40 libxfs/topology.c | 6 +--
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]41 libxfs/trans.c | 8 ++--
42 libxfs/util.c | 8 ++--
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]43 libxfs/xfile.c | 4 +-
44 libxfs/xfs_ag.c | 8 ++--
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]45 libxfs/xfs_ag_resv.c | 6 +--
46 libxfs/xfs_alloc.c | 6 +--
47 libxfs/xfs_alloc_btree.c | 6 +--
48 libxfs/xfs_attr.c | 8 ++--
49 libxfs/xfs_attr_leaf.c | 8 ++--
50 libxfs/xfs_attr_remote.c | 8 ++--
51 libxfs/xfs_bmap.c | 8 ++--
52 libxfs/xfs_bmap_btree.c | 8 ++--
53 libxfs/xfs_btree.c | 8 ++--
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]54 libxfs/xfs_btree_mem.c | 6 +--
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]55 libxfs/xfs_btree_staging.c | 8 ++--
56 libxfs/xfs_da_btree.c | 8 ++--
57 libxfs/xfs_defer.c | 8 ++--
58 libxfs/xfs_dir2.c | 8 ++--
59 libxfs/xfs_dir2_block.c | 8 ++--
60 libxfs/xfs_dir2_data.c | 6 +--
61 libxfs/xfs_dir2_leaf.c | 8 ++--
62 libxfs/xfs_dir2_node.c | 8 ++--
63 libxfs/xfs_dir2_sf.c | 8 ++--
64 libxfs/xfs_dquot_buf.c | 6 +--
65 libxfs/xfs_ialloc.c | 8 ++--
66 libxfs/xfs_ialloc_btree.c | 6 +--
67 libxfs/xfs_iext_tree.c | 6 +--
68 libxfs/xfs_inode_buf.c | 6 +--
69 libxfs/xfs_inode_fork.c | 8 ++--
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]70 libxfs/xfs_log_rlimit.c | 4 +-
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]71 libxfs/xfs_refcount.c | 6 +--
72 libxfs/xfs_refcount_btree.c | 6 +--
73 libxfs/xfs_rmap.c | 8 ++--
74 libxfs/xfs_rmap_btree.c | 6 +--
75 libxfs/xfs_rtbitmap.c | 6 +--
76 libxfs/xfs_sb.c | 6 +--
77 libxfs/xfs_symlink_remote.c | 6 +--
78 libxfs/xfs_trans_inode.c | 6 +--
79 libxfs/xfs_trans_resv.c | 6 +--
80 libxfs/xfs_types.c | 2 +-
81 mkfs/proto.c | 2 +-
82 mkfs/xfs_mkfs.c | 8 ++--
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]83 76 files changed, 267 insertions(+), 267 deletions(-)
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]84
85diff --git a/include/libxfs.h b/include/libxfs.h
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]86index fb8efb69..7cfed63b 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]87--- a/include/libxfs.h
88+++ b/include/libxfs.h
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]89@@ -12,7 +12,7 @@
90 /* Ditto in-memory btrees */
91 #define CONFIG_XFS_BTREE_IN_MEM
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]92
93-#include "libxfs_api_defs.h"
94+#include "libxfs/libxfs_api_defs.h"
95 #include "platform_defs.h"
96 #include "xfs.h"
97
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]98@@ -27,15 +27,15 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]99 #include "atomic.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]100 #include "spinlock.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]101
102-#include "xfs_types.h"
103-#include "xfs_fs.h"
104+#include "libxfs/xfs_types.h"
105+#include "libxfs/xfs_fs.h"
106 #include "xfs_arch.h"
107
108-#include "xfs_shared.h"
109-#include "xfs_format.h"
110-#include "xfs_log_format.h"
111-#include "xfs_quota_defs.h"
112-#include "xfs_trans_resv.h"
113+#include "libxfs/xfs_shared.h"
114+#include "libxfs/xfs_format.h"
115+#include "libxfs/xfs_log_format.h"
116+#include "libxfs/xfs_quota_defs.h"
117+#include "libxfs/xfs_trans_resv.h"
118
119
120 /* CRC stuff, buffer API dependent on it */
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]121@@ -44,7 +44,7 @@ extern uint32_t crc32c_le(uint32_t crc, unsigned char const *p, size_t len);
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]122
123 /* fake up kernel's iomap, (not) used in xfs_bmap.[ch] */
124 struct iomap;
125-#include "xfs_cksum.h"
126+#include "libxfs/xfs_cksum.h"
127
128 #define __round_mask(x, y) ((__typeof__(x))((y)-1))
129 #define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]130@@ -55,41 +55,41 @@ struct iomap;
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]131 * This mirrors the kernel include for xfs_buf.h - it's implicitly included in
132 * every files via a similar include in the kernel xfs_linux.h.
133 */
134-#include "libxfs_io.h"
135+#include "libxfs/libxfs_io.h"
136
137-#include "xfs_bit.h"
138-#include "xfs_sb.h"
139+#include "libxfs/xfs_bit.h"
140+#include "libxfs/xfs_sb.h"
141 #include "xfs_mount.h"
142-#include "xfs_defer.h"
143-#include "xfs_errortag.h"
144-#include "xfs_da_format.h"
145-#include "xfs_da_btree.h"
146+#include "libxfs/xfs_defer.h"
147+#include "libxfs/xfs_errortag.h"
148+#include "libxfs/xfs_da_format.h"
149+#include "libxfs/xfs_da_btree.h"
150 #include "xfs_inode.h"
151-#include "xfs_dir2.h"
152-#include "xfs_dir2_priv.h"
153-#include "xfs_bmap_btree.h"
154-#include "xfs_alloc_btree.h"
155-#include "xfs_ialloc_btree.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]156-#include "xfs_attr.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]157-#include "xfs_attr_sf.h"
158-#include "xfs_inode_fork.h"
159-#include "xfs_inode_buf.h"
160-#include "xfs_alloc.h"
161-#include "xfs_btree.h"
162-#include "xfs_bmap.h"
163+#include "libxfs/xfs_dir2.h"
164+#include "libxfs/xfs_dir2_priv.h"
165+#include "libxfs/xfs_bmap_btree.h"
166+#include "libxfs/xfs_alloc_btree.h"
167+#include "libxfs/xfs_ialloc_btree.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]168+#include "libxfs/xfs_attr.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]169+#include "libxfs/xfs_attr_sf.h"
170+#include "libxfs/xfs_inode_fork.h"
171+#include "libxfs/xfs_inode_buf.h"
172+#include "libxfs/xfs_alloc.h"
173+#include "libxfs/xfs_btree.h"
174+#include "libxfs/xfs_bmap.h"
175 #include "xfs_trace.h"
176 #include "xfs_trans.h"
177-#include "xfs_ag.h"
178-#include "xfs_rmap_btree.h"
179-#include "xfs_rmap.h"
180-#include "xfs_refcount_btree.h"
181-#include "xfs_refcount.h"
182-#include "xfs_btree_staging.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]183-#include "xfs_rtbitmap.h"
184-#include "xfs_symlink_remote.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]185+#include "libxfs/xfs_ag.h"
186+#include "libxfs/xfs_rmap_btree.h"
187+#include "libxfs/xfs_rmap.h"
188+#include "libxfs/xfs_refcount_btree.h"
189+#include "libxfs/xfs_refcount.h"
190+#include "libxfs/xfs_btree_staging.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]191+#include "libxfs/xfs_rtbitmap.h"
192+#include "libxfs/xfs_symlink_remote.h"
193 #include "libxfs/xfile.h"
194 #include "libxfs/buf_mem.h"
195-#include "xfs_btree_mem.h"
196+#include "libxfs/xfs_btree_mem.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]197
198 #ifndef ARRAY_SIZE
199 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]200@@ -178,11 +178,11 @@ extern void cmn_err(int, char *, ...);
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]201 enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };
202 #endif
203
204-#include "xfs_ialloc.h"
205+#include "libxfs/xfs_ialloc.h"
206
207-#include "xfs_attr_leaf.h"
208-#include "xfs_attr_remote.h"
209-#include "xfs_trans_space.h"
210+#include "libxfs/xfs_attr_leaf.h"
211+#include "libxfs/xfs_attr_remote.h"
212+#include "libxfs/xfs_trans_space.h"
213
214 #define XFS_INOBT_IS_FREE_DISK(rp,i) \
215 ((be64_to_cpu((rp)->ir_free) & XFS_INOBT_MASK(i)) != 0)
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]216@@ -225,8 +225,8 @@ libxfs_bmbt_disk_get_all(
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]217 int libxfs_rtfree_extent(struct xfs_trans *, xfs_rtblock_t, xfs_extlen_t);
218 bool libxfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno);
219
220-#include "xfs_attr.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]221-#include "topology.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]222+#include "libxfs/xfs_attr.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]223+#include "libxfs/topology.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]224
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]225 /*
226 * Superblock helpers for programs that act on independent superblock
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]227diff --git a/include/linux.h b/include/linux.h
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]228index a13072d2..99374334 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]229--- a/include/linux.h
230+++ b/include/linux.h
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]231@@ -10,7 +10,7 @@
232 * userspace projects!
233 */
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]234
235-#include <uuid/uuid.h>
236+#include "libuuid/src/uuid.h"
237 #include <sys/vfs.h>
238 #include <sys/ioctl.h>
239 #include <sys/param.h>
240diff --git a/include/xfs.h b/include/xfs.h
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]241index e97158c8..6b93b993 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]242--- a/include/xfs.h
243+++ b/include/xfs.h
244@@ -6,7 +6,7 @@
245 #define __XFS_H__
246
247 #if defined(__linux__)
248-#include <xfs/linux.h>
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]249+#include "linux.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]250 #else
251 # error unknown platform... have fun porting!
252 #endif
253@@ -40,9 +40,9 @@ extern int xfs_assert_largefile[sizeof(off_t)-8];
254
255 #define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))
256
257-#include <xfs/xfs_types.h>
258+#include "libxfs/xfs_types.h"
259 /* Include deprecated/compat pre-vfs xfs-specific symbols */
260-#include <xfs/xfs_fs_compat.h>
261-#include <xfs/xfs_fs.h>
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]262+#include "xfs_fs_compat.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]263+#include "libxfs/xfs_fs.h"
264
265 #endif /* __XFS_H__ */
266diff --git a/include/xfs_inode.h b/include/xfs_inode.h
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]267index a351bb0d..a209179d 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]268--- a/include/xfs_inode.h
269+++ b/include/xfs_inode.h
270@@ -8,8 +8,8 @@
271 #define __XFS_INODE_H__
272
273 /* These match kernel side includes */
274-#include "xfs_inode_buf.h"
275-#include "xfs_inode_fork.h"
276+#include "libxfs/xfs_inode_buf.h"
277+#include "libxfs/xfs_inode_fork.h"
278
279 struct xfs_trans;
280 struct xfs_mount;
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]281diff --git a/libfrog/avl64.c b/libfrog/avl64.c
282index 2547bf3b..c5c032b0 100644
283--- a/libfrog/avl64.c
284+++ b/libfrog/avl64.c
285@@ -5,7 +5,7 @@
286 */
287 #include <stdint.h>
288 #include <stdio.h>
289-#include "platform_defs.h"
290+#include "include/platform_defs.h"
291 #include "avl64.h"
292
293 #define CERT ASSERT
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]294diff --git a/libfrog/bitmap.c b/libfrog/bitmap.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]295index 5af5ab8d..d91a65f4 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]296--- a/libfrog/bitmap.c
297+++ b/libfrog/bitmap.c
298@@ -3,14 +3,14 @@
299 * Copyright (C) 2018 Oracle. All Rights Reserved.
300 * Author: Darrick J. Wong <darrick.wong@oracle.com>
301 */
302-#include "xfs.h"
303+#include "include/xfs.h"
304 #include <stdint.h>
305 #include <stdlib.h>
306 #include <assert.h>
307 #include <pthread.h>
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]308-#include "platform_defs.h"
309+#include "include/platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]310 #include "avl64.h"
311-#include "list.h"
312+#include "include/list.h"
313 #include "bitmap.h"
314
315 /*
316diff --git a/libfrog/bulkstat.c b/libfrog/bulkstat.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]317index c863bcb6..13149c1a 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]318--- a/libfrog/bulkstat.c
319+++ b/libfrog/bulkstat.c
320@@ -5,7 +5,7 @@
321 */
322 #include <string.h>
323 #include <strings.h>
324-#include "xfs.h"
325+#include "include/xfs.h"
326 #include "fsgeom.h"
327 #include "bulkstat.h"
328
329diff --git a/libfrog/convert.c b/libfrog/convert.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]330index 0ceeb389..0768c19a 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]331--- a/libfrog/convert.c
332+++ b/libfrog/convert.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]333@@ -3,8 +3,8 @@
334 * Copyright (c) 2003-2005 Silicon Graphics, Inc.
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]335 * All Rights Reserved.
336 */
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]337-#include "platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]338-#include "input.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]339+#include "include/platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]340+#include "include/input.h"
341 #include <ctype.h>
342 #include <stdbool.h>
343
344diff --git a/libfrog/crc32.c b/libfrog/crc32.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]345index d07e5371..59d4a170 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]346--- a/libfrog/crc32.c
347+++ b/libfrog/crc32.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]348@@ -39,7 +39,7 @@
349 #include <asm/types.h>
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]350 #include <sys/time.h>
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]351 /* For endian conversion routines */
352-#include "xfs_arch.h"
353+#include "include/xfs_arch.h"
354 #include "crc32defs.h"
355 #include "crc32c.h"
356
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]357diff --git a/libfrog/crc32cselftest.h b/libfrog/crc32cselftest.h
358index ad9c74c7..f972a142 100644
359--- a/libfrog/crc32cselftest.h
360+++ b/libfrog/crc32cselftest.h
361@@ -30,7 +30,7 @@
362 */
363
364 /* This is just the crc32 self test bits from crc32.c. */
365-#include "libfrog/randbytes.h"
366+#include "randbytes.h"
367
368 #ifndef __LIBFROG_CRC32CSELFTEST_H__
369 #define __LIBFROG_CRC32CSELFTEST_H__
370diff --git a/libfrog/dahashselftest.h b/libfrog/dahashselftest.h
371index ea9d925b..92549277 100644
372--- a/libfrog/dahashselftest.h
373+++ b/libfrog/dahashselftest.h
374@@ -3,7 +3,7 @@
375 * Copyright (C) 2023 Oracle. All Rights Reserved.
376 * Author: Darrick J. Wong <djwong@kernel.org>
377 */
378-#include "libfrog/randbytes.h"
379+#include "randbytes.h"
380
381 #ifndef __LIBFROG_DAHASHSELFTEST_H__
382 #define __LIBFROG_DAHASHSELFTEST_H__
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]383diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]384index 3e7f0797..688b644d 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]385--- a/libfrog/fsgeom.c
386+++ b/libfrog/fsgeom.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]387@@ -2,9 +2,9 @@
388 /*
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]389 * Copyright (c) 2000-2005 Silicon Graphics, Inc. All Rights Reserved.
390 */
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]391-#include "platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]392-#include "xfs.h"
393-#include "bitops.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]394+#include "include/platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]395+#include "include/xfs.h"
396+#include "include/bitops.h"
397 #include "fsgeom.h"
398 #include "util.h"
399
400diff --git a/libfrog/linux.c b/libfrog/linux.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]401index 46a5ff39..1f312f16 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]402--- a/libfrog/linux.c
403+++ b/libfrog/linux.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]404@@ -9,10 +9,10 @@
405 #include <sys/ioctl.h>
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]406 #include <sys/sysinfo.h>
407
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]408-#include "platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]409-#include "xfs.h"
410-#include "init.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]411-#include "libfrog/platform.h"
412+#include "include/platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]413+#include "include/xfs.h"
414+#include "libxfs/init.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]415+#include "platform.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]416
417 extern char *progname;
418 static int max_block_alignment;
419diff --git a/libfrog/list_sort.c b/libfrog/list_sort.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]420index 994a51fe..58e1537d 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]421--- a/libfrog/list_sort.c
422+++ b/libfrog/list_sort.c
423@@ -1,7 +1,7 @@
424 /* List sorting code from Linux::lib/list_sort.c. */
425 #include <stdlib.h>
426 #include <string.h>
427-#include "list.h"
428+#include "include/list.h"
429
430 #define unlikely(x) (x)
431 #define MAX_LIST_LENGTH_BITS 20
432diff --git a/libfrog/paths.c b/libfrog/paths.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]433index 320b26db..b144b438 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]434--- a/libfrog/paths.c
435+++ b/libfrog/paths.c
436@@ -13,7 +13,7 @@
437 #include <sys/types.h>
438 #include <sys/stat.h>
439 #include "paths.h"
440-#include "input.h"
441+#include "include/input.h"
442 #include "projects.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]443 #include <mntent.h>
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]444 #include <limits.h>
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]445diff --git a/libfrog/paths.h b/libfrog/paths.h
446index f20a2c3e..b874f0f1 100644
447--- a/libfrog/paths.h
448+++ b/libfrog/paths.h
449@@ -6,7 +6,7 @@
450 #ifndef __LIBFROG_PATH_H__
451 #define __LIBFROG_PATH_H__
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]452
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]453-#include "platform_defs.h"
454+#include "include/platform_defs.h"
455
456 /*
457 * XFS Filesystem Paths
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]458diff --git a/libfrog/projects.h b/libfrog/projects.h
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]459index 77919474..32ea47b4 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]460--- a/libfrog/projects.h
461+++ b/libfrog/projects.h
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]462@@ -6,8 +6,8 @@
463 #ifndef __LIBFROG_PROJECTS_H__
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]464 #define __LIBFROG_PROJECTS_H__
465
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]466-#include "platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]467-#include "xfs.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]468+#include "include/platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]469+#include "include/xfs.h"
470
471 extern int setprojid(const char *__name, int __fd, prid_t __id);
472 extern int getprojid(const char *__name, int __fd, prid_t *__id);
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]473diff --git a/libfrog/ptvar.c b/libfrog/ptvar.c
474index 7ac8c541..85193841 100644
475--- a/libfrog/ptvar.c
476+++ b/libfrog/ptvar.c
477@@ -10,7 +10,7 @@
478 #include <assert.h>
479 #include <pthread.h>
480 #include <unistd.h>
481-#include "platform_defs.h"
482+#include "include/platform_defs.h"
483 #include "ptvar.h"
484
485 /*
486diff --git a/libfrog/radix-tree.c b/libfrog/radix-tree.c
487index 261fc248..f3a21db7 100644
488--- a/libfrog/radix-tree.c
489+++ b/libfrog/radix-tree.c
490@@ -8,7 +8,7 @@
491 #include <string.h>
492 #include <errno.h>
493 #include <stdint.h>
494-#include "platform_defs.h"
495+#include "include/platform_defs.h"
496 #include "radix-tree.h"
497
498 #ifndef ARRAY_SIZE
499diff --git a/libfrog/randbytes.c b/libfrog/randbytes.c
500index f22da0d3..c12d2fd1 100644
501--- a/libfrog/randbytes.c
502+++ b/libfrog/randbytes.c
503@@ -6,8 +6,8 @@
504 *
505 * This is the buffer of random bytes used for self tests.
506 */
507-#include "platform_defs.h"
508-#include "libfrog/randbytes.h"
509+#include "include/platform_defs.h"
510+#include "randbytes.h"
511
512 /* 4096 random bytes */
513 uint8_t __attribute__((__aligned__(8))) randbytes_test_buf[] =
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]514diff --git a/libfrog/scrub.c b/libfrog/scrub.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]515index 1df2965f..129546e5 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]516--- a/libfrog/scrub.c
517+++ b/libfrog/scrub.c
518@@ -3,7 +3,7 @@
519 * Copyright (c) 2019 Oracle, Inc.
520 * All Rights Reserved.
521 */
522-#include "xfs.h"
523+#include "include/xfs.h"
524 #include "fsgeom.h"
525 #include "scrub.h"
526
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]527diff --git a/libfrog/util.c b/libfrog/util.c
528index 8fb10cf8..124d7c88 100644
529--- a/libfrog/util.c
530+++ b/libfrog/util.c
531@@ -3,7 +3,7 @@
532 * Copyright (c) 2000-2005 Silicon Graphics, Inc.
533 * All Rights Reserved.
534 */
535-#include "platform_defs.h"
536+#include "include/platform_defs.h"
537 #include "util.h"
538
539 /*
540diff --git a/libxcmd/command.c b/libxcmd/command.c
541index e2603097..f95a45d9 100644
542--- a/libxcmd/command.c
543+++ b/libxcmd/command.c
544@@ -4,9 +4,9 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]545 * All Rights Reserved.
546 */
547
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]548-#include "platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]549-#include "command.h"
550-#include "input.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]551+#include "include/platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]552+#include "include/command.h"
553+#include "include/input.h"
554
555 cmdinfo_t *cmdtab;
556 int ncmds;
557diff --git a/libxcmd/help.c b/libxcmd/help.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]558index b7e02073..cbe195d7 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]559--- a/libxcmd/help.c
560+++ b/libxcmd/help.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]561@@ -4,9 +4,9 @@
562 * All Rights Reserved.
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]563 */
564
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]565-#include "platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]566-#include "command.h"
567-#include "../quota/init.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]568+#include "include/platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]569+#include "include/command.h"
570+#include "quota/init.h"
571
572 static cmdinfo_t help_cmd;
573 static void help_onecmd(const char *cmd, const cmdinfo_t *ct);
574diff --git a/libxcmd/input.c b/libxcmd/input.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]575index fa80e5ab..35a9188a 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]576--- a/libxcmd/input.c
577+++ b/libxcmd/input.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]578@@ -4,8 +4,8 @@
579 * All Rights Reserved.
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]580 */
581
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]582-#include "platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]583-#include "input.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]584+#include "include/platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]585+#include "include/input.h"
586 #include <ctype.h>
587 #include <stdbool.h>
588
589diff --git a/libxcmd/quit.c b/libxcmd/quit.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]590index 7c2d04f8..153e959f 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]591--- a/libxcmd/quit.c
592+++ b/libxcmd/quit.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]593@@ -4,9 +4,9 @@
594 * All Rights Reserved.
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]595 */
596
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]597-#include "platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]598-#include "command.h"
599-#include "../quota/init.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]600+#include "include/platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]601+#include "include/command.h"
602+#include "quota/init.h"
603
604 static cmdinfo_t quit_cmd;
605
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]606diff --git a/libxfs/buf_mem.c b/libxfs/buf_mem.c
607index e5b91d3c..4fa15a28 100644
608--- a/libxfs/buf_mem.c
609+++ b/libxfs/buf_mem.c
610@@ -4,9 +4,9 @@
611 * Author: Darrick J. Wong <djwong@kernel.org>
612 */
613 #include "libxfs_priv.h"
614-#include "libxfs.h"
615-#include "libxfs/xfile.h"
616-#include "libxfs/buf_mem.h"
617+#include "include/libxfs.h"
618+#include "xfile.h"
619+#include "buf_mem.h"
620 #include <sys/mman.h>
621 #include <sys/types.h>
622 #include <sys/wait.h>
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]623diff --git a/libxfs/cache.c b/libxfs/cache.c
624index 139c7c1b..f2e955b5 100644
625--- a/libxfs/cache.c
626+++ b/libxfs/cache.c
627@@ -15,7 +15,7 @@
628 #include "xfs_shared.h"
629 #include "xfs_format.h"
630 #include "xfs_trans_resv.h"
631-#include "xfs_mount.h"
632+#include "include/xfs_mount.h"
633 #include "xfs_bit.h"
634
635 #define CACHE_DEBUG 1
636diff --git a/libxfs/defer_item.c b/libxfs/defer_item.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]637index 21dd1d0f..7ef7d8fe 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]638--- a/libxfs/defer_item.c
639+++ b/libxfs/defer_item.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]640@@ -12,18 +12,18 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]641 #include "xfs_trans_resv.h"
642 #include "xfs_bit.h"
643 #include "xfs_sb.h"
644-#include "xfs_mount.h"
645+#include "include/xfs_mount.h"
646 #include "xfs_defer.h"
647-#include "xfs_trans.h"
648+#include "include/xfs_trans.h"
649 #include "xfs_bmap.h"
650 #include "xfs_alloc.h"
651 #include "xfs_rmap.h"
652 #include "xfs_refcount.h"
653 #include "xfs_bmap.h"
654-#include "xfs_inode.h"
655+#include "include/xfs_inode.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]656 #include "xfs_da_btree.h"
657 #include "xfs_attr.h"
658-#include "libxfs.h"
659+#include "include/libxfs.h"
660 #include "defer_item.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]661
662 /* Dummy defer item ops, since we don't do logging. */
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]663diff --git a/libxfs/init.c b/libxfs/init.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]664index de91bbf3..c74a39f1 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]665--- a/libxfs/init.c
666+++ b/libxfs/init.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]667@@ -13,24 +13,24 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]668 #include "xfs_format.h"
669 #include "xfs_log_format.h"
670 #include "xfs_trans_resv.h"
671-#include "xfs_mount.h"
672+#include "include/xfs_mount.h"
673 #include "xfs_defer.h"
674 #include "xfs_inode_buf.h"
675 #include "xfs_inode_fork.h"
676-#include "xfs_inode.h"
677-#include "xfs_trans.h"
678+#include "include/xfs_inode.h"
679+#include "include/xfs_trans.h"
680 #include "xfs_rmap_btree.h"
681 #include "xfs_refcount_btree.h"
682 #include "libfrog/platform.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]683-#include "libxfs/xfile.h"
684-#include "libxfs/buf_mem.h"
685+#include "xfile.h"
686+#include "buf_mem.h"
687
688 #include "xfs_format.h"
689 #include "xfs_da_format.h"
690 #include "xfs_log_format.h"
691 #include "xfs_ondisk.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]692
693-#include "libxfs.h" /* for now */
694+#include "include/libxfs.h" /* for now */
695
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]696 #ifndef HAVE_LIBURCU_ATOMIC64
697 pthread_mutex_t atomic64_lock = PTHREAD_MUTEX_INITIALIZER;
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]698diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]699index 81f641f3..78a70a54 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]700--- a/libxfs/libxfs_priv.h
701+++ b/libxfs/libxfs_priv.h
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]702@@ -41,23 +41,23 @@
703 #define CONFIG_XFS_BTREE_IN_MEM
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]704
705 #include "libxfs_api_defs.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]706-#include "platform_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]707-#include "xfs.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]708-
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]709-#include "list.h"
710-#include "hlist.h"
711-#include "cache.h"
712-#include "bitops.h"
713-#include "kmem.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]714+#include "include/platform_defs.h"
715+#include "include/xfs.h"
716+
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]717+#include "include/list.h"
718+#include "include/hlist.h"
719+#include "include/cache.h"
720+#include "include/bitops.h"
721+#include "include/kmem.h"
722 #include "libfrog/radix-tree.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]723 #include "libfrog/bitmask.h"
724 #include "libfrog/div64.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]725-#include "atomic.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]726-#include "spinlock.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]727+#include "include/atomic.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]728+#include "include/spinlock.h"
729 #include "linux-err.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]730
731 #include "xfs_types.h"
732-#include "xfs_arch.h"
733+#include "include/xfs_arch.h"
734
735 #include "xfs_fs.h"
736 #include "libfrog/crc32c.h"
737diff --git a/libxfs/logitem.c b/libxfs/logitem.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]738index 7757259d..f5030506 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]739--- a/libxfs/logitem.c
740+++ b/libxfs/logitem.c
741@@ -10,11 +10,11 @@
742 #include "xfs_format.h"
743 #include "xfs_log_format.h"
744 #include "xfs_trans_resv.h"
745-#include "xfs_mount.h"
746+#include "include/xfs_mount.h"
747 #include "xfs_inode_buf.h"
748 #include "xfs_inode_fork.h"
749-#include "xfs_inode.h"
750-#include "xfs_trans.h"
751+#include "include/xfs_inode.h"
752+#include "include/xfs_trans.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]753 #include "xfs_rtbitmap.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]754
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]755 struct kmem_cache *xfs_buf_item_cache;
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]756diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]757index 0a87e5b6..14a93edf 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]758--- a/libxfs/rdwr.c
759+++ b/libxfs/rdwr.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]760@@ -12,15 +12,15 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]761 #include "xfs_format.h"
762 #include "xfs_log_format.h"
763 #include "xfs_trans_resv.h"
764-#include "xfs_mount.h"
765+#include "include/xfs_mount.h"
766 #include "xfs_inode_buf.h"
767 #include "xfs_inode_fork.h"
768-#include "xfs_inode.h"
769-#include "xfs_trans.h"
770+#include "include/xfs_inode.h"
771+#include "include/xfs_trans.h"
772 #include "libfrog/platform.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]773-#include "libxfs/xfile.h"
774-#include "libxfs/buf_mem.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]775-#include "libxfs.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]776+#include "xfile.h"
777+#include "buf_mem.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]778+#include "include/libxfs.h"
779
780 static void libxfs_brelse(struct cache_node *node);
781
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]782diff --git a/libxfs/topology.c b/libxfs/topology.c
783index 94adb5be..60499192 100644
784--- a/libxfs/topology.c
785+++ b/libxfs/topology.c
786@@ -5,9 +5,9 @@
787 */
788
789 #include "libxfs_priv.h"
790-#include "libxcmd.h"
791-#include <blkid/blkid.h>
792-#include "xfs_multidisk.h"
793+#include "include/libxcmd.h"
794+#include "blkid.h"
795+#include "include/xfs_multidisk.h"
796 #include "libfrog/platform.h"
797
798 #define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog)))
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]799diff --git a/libxfs/trans.c b/libxfs/trans.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]800index 7fec2caf..e9c81eb8 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]801--- a/libxfs/trans.c
802+++ b/libxfs/trans.c
803@@ -11,14 +11,14 @@
804 #include "xfs_format.h"
805 #include "xfs_log_format.h"
806 #include "xfs_trans_resv.h"
807-#include "xfs_mount.h"
808+#include "include/xfs_mount.h"
809 #include "xfs_inode_buf.h"
810 #include "xfs_inode_fork.h"
811-#include "xfs_inode.h"
812-#include "xfs_trans.h"
813+#include "include/xfs_inode.h"
814+#include "include/xfs_trans.h"
815 #include "xfs_sb.h"
816 #include "xfs_defer.h"
817-#include "xfs_trace.h"
818+#include "include/xfs_trace.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]819 #include "xfs_rtbitmap.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]820
821 static void xfs_trans_free_items(struct xfs_trans *tp);
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]822diff --git a/libxfs/util.c b/libxfs/util.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]823index 841f4b96..db2ea546 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]824--- a/libxfs/util.c
825+++ b/libxfs/util.c
826@@ -5,7 +5,7 @@
827 */
828
829 #include "libxfs_priv.h"
830-#include "libxfs.h"
831+#include "include/libxfs.h"
832 #include "libxfs_io.h"
833 #include "init.h"
834 #include "xfs_fs.h"
835@@ -13,12 +13,12 @@
836 #include "xfs_format.h"
837 #include "xfs_log_format.h"
838 #include "xfs_trans_resv.h"
839-#include "xfs_mount.h"
840+#include "include/xfs_mount.h"
841 #include "xfs_defer.h"
842 #include "xfs_inode_buf.h"
843 #include "xfs_inode_fork.h"
844-#include "xfs_inode.h"
845-#include "xfs_trans.h"
846+#include "include/xfs_inode.h"
847+#include "include/xfs_trans.h"
848 #include "xfs_bmap.h"
849 #include "xfs_bmap_btree.h"
850 #include "xfs_trans_space.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]851diff --git a/libxfs/xfile.c b/libxfs/xfile.c
852index fdb76f40..31485494 100644
853--- a/libxfs/xfile.c
854+++ b/libxfs/xfile.c
855@@ -4,8 +4,8 @@
856 * Author: Darrick J. Wong <djwong@kernel.org>
857 */
858 #include "libxfs_priv.h"
859-#include "libxfs.h"
860-#include "libxfs/xfile.h"
861+#include "include/libxfs.h"
862+#include "xfile.h"
863 #include <linux/memfd.h>
864 #include <sys/mman.h>
865 #include <sys/types.h>
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]866diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]867index a9aae099..3e8775fc 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]868--- a/libxfs/xfs_ag.c
869+++ b/libxfs/xfs_ag.c
870@@ -12,7 +12,7 @@
871 #include "xfs_trans_resv.h"
872 #include "xfs_bit.h"
873 #include "xfs_sb.h"
874-#include "xfs_mount.h"
875+#include "include/xfs_mount.h"
876 #include "xfs_btree.h"
877 #include "xfs_alloc_btree.h"
878 #include "xfs_rmap_btree.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]879@@ -25,9 +25,9 @@
880 #include "xfs_bmap.h"
881 #include "xfs_defer.h"
882 #include "xfs_log_format.h"
883-#include "xfs_trans.h"
884-#include "xfs_trace.h"
885-#include "xfs_inode.h"
886+#include "include/xfs_trans.h"
887+#include "include/xfs_trace.h"
888+#include "include/xfs_inode.h"
889
890
891 /*
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]892diff --git a/libxfs/xfs_ag_resv.c b/libxfs/xfs_ag_resv.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]893index 3a80b161..f56845d8 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]894--- a/libxfs/xfs_ag_resv.c
895+++ b/libxfs/xfs_ag_resv.c
896@@ -9,11 +9,11 @@
897 #include "xfs_format.h"
898 #include "xfs_log_format.h"
899 #include "xfs_trans_resv.h"
900-#include "xfs_mount.h"
901+#include "include/xfs_mount.h"
902 #include "xfs_alloc.h"
903 #include "xfs_errortag.h"
904-#include "xfs_trace.h"
905-#include "xfs_trans.h"
906+#include "include/xfs_trace.h"
907+#include "include/xfs_trans.h"
908 #include "xfs_rmap_btree.h"
909 #include "xfs_btree.h"
910 #include "xfs_refcount_btree.h"
911diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]912index 0eefb16c..948580c3 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]913--- a/libxfs/xfs_alloc.c
914+++ b/libxfs/xfs_alloc.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]915@@ -10,15 +10,15 @@
916 #include "xfs_shared.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]917 #include "xfs_trans_resv.h"
918 #include "xfs_bit.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]919-#include "xfs_mount.h"
920+#include "include/xfs_mount.h"
921 #include "xfs_defer.h"
922 #include "xfs_btree.h"
923 #include "xfs_rmap.h"
924 #include "xfs_alloc_btree.h"
925 #include "xfs_alloc.h"
926 #include "xfs_errortag.h"
927-#include "xfs_trace.h"
928-#include "xfs_trans.h"
929+#include "include/xfs_trace.h"
930+#include "include/xfs_trans.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]931 #include "xfs_ag.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]932 #include "xfs_ag_resv.h"
933 #include "xfs_bmap.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]934diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]935index 949eb02c..394a7c3d 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]936--- a/libxfs/xfs_alloc_btree.c
937+++ b/libxfs/xfs_alloc_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]938@@ -9,13 +9,13 @@
939 #include "xfs_format.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]940 #include "xfs_log_format.h"
941 #include "xfs_trans_resv.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]942-#include "xfs_mount.h"
943+#include "include/xfs_mount.h"
944 #include "xfs_btree.h"
945 #include "xfs_btree_staging.h"
946 #include "xfs_alloc_btree.h"
947 #include "xfs_alloc.h"
948-#include "xfs_trace.h"
949-#include "xfs_trans.h"
950+#include "include/xfs_trace.h"
951+#include "include/xfs_trans.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]952 #include "xfs_ag.h"
953 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]954
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]955diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]956index caf04daa..7f435308 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]957--- a/libxfs/xfs_attr.c
958+++ b/libxfs/xfs_attr.c
959@@ -9,13 +9,13 @@
960 #include "xfs_format.h"
961 #include "xfs_log_format.h"
962 #include "xfs_trans_resv.h"
963-#include "xfs_mount.h"
964+#include "include/xfs_mount.h"
965 #include "xfs_defer.h"
966 #include "xfs_da_format.h"
967 #include "xfs_da_btree.h"
968 #include "xfs_attr_sf.h"
969-#include "xfs_inode.h"
970-#include "xfs_trans.h"
971+#include "include/xfs_inode.h"
972+#include "include/xfs_trans.h"
973 #include "xfs_bmap.h"
974 #include "xfs_bmap_btree.h"
975 #include "xfs_attr.h"
976@@ -23,7 +23,7 @@
977 #include "xfs_attr_remote.h"
978 #include "xfs_quota_defs.h"
979 #include "xfs_trans_space.h"
980-#include "xfs_trace.h"
981+#include "include/xfs_trace.h"
982
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]983 struct kmem_cache *xfs_attr_intent_cache;
984
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]985diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]986index a44312cd..99de29f0 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]987--- a/libxfs/xfs_attr_leaf.c
988+++ b/libxfs/xfs_attr_leaf.c
989@@ -11,18 +11,18 @@
990 #include "xfs_log_format.h"
991 #include "xfs_trans_resv.h"
992 #include "xfs_sb.h"
993-#include "xfs_mount.h"
994+#include "include/xfs_mount.h"
995 #include "xfs_da_format.h"
996 #include "xfs_da_btree.h"
997-#include "xfs_inode.h"
998-#include "xfs_trans.h"
999+#include "include/xfs_inode.h"
1000+#include "include/xfs_trans.h"
1001 #include "xfs_bmap_btree.h"
1002 #include "xfs_bmap.h"
1003 #include "xfs_attr_sf.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1004 #include "xfs_attr.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1005 #include "xfs_attr_remote.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1006 #include "xfs_attr_leaf.h"
1007-#include "xfs_trace.h"
1008+#include "include/xfs_trace.h"
1009 #include "xfs_dir2.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1010 #include "xfs_ag.h"
1011 #include "xfs_errortag.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1012diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1013index 855d090c..142fa9e3 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1014--- a/libxfs/xfs_attr_remote.c
1015+++ b/libxfs/xfs_attr_remote.c
1016@@ -11,16 +11,16 @@
1017 #include "xfs_log_format.h"
1018 #include "xfs_trans_resv.h"
1019 #include "xfs_bit.h"
1020-#include "xfs_mount.h"
1021+#include "include/xfs_mount.h"
1022 #include "xfs_defer.h"
1023 #include "xfs_da_format.h"
1024 #include "xfs_da_btree.h"
1025-#include "xfs_inode.h"
1026-#include "xfs_trans.h"
1027+#include "include/xfs_inode.h"
1028+#include "include/xfs_trans.h"
1029 #include "xfs_bmap.h"
1030 #include "xfs_attr.h"
1031 #include "xfs_attr_remote.h"
1032-#include "xfs_trace.h"
1033+#include "include/xfs_trace.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1034 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1035
1036 #define ATTR_RMTVALUE_MAPSIZE 1 /* # of map entries at once */
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1037diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1038index b089f53e..3d61b799 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1039--- a/libxfs/xfs_bmap.c
1040+++ b/libxfs/xfs_bmap.c
1041@@ -11,18 +11,18 @@
1042 #include "xfs_trans_resv.h"
1043 #include "xfs_bit.h"
1044 #include "xfs_sb.h"
1045-#include "xfs_mount.h"
1046+#include "include/xfs_mount.h"
1047 #include "xfs_defer.h"
1048 #include "xfs_dir2.h"
1049-#include "xfs_inode.h"
1050+#include "include/xfs_inode.h"
1051 #include "xfs_btree.h"
1052-#include "xfs_trans.h"
1053+#include "include/xfs_trans.h"
1054 #include "xfs_alloc.h"
1055 #include "xfs_bmap.h"
1056 #include "xfs_bmap_btree.h"
1057 #include "xfs_errortag.h"
1058 #include "xfs_trans_space.h"
1059-#include "xfs_trace.h"
1060+#include "include/xfs_trace.h"
1061 #include "xfs_attr_leaf.h"
1062 #include "xfs_quota_defs.h"
1063 #include "xfs_rmap.h"
1064diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1065index 2a603b4d..94540f28 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1066--- a/libxfs/xfs_bmap_btree.c
1067+++ b/libxfs/xfs_bmap_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1068@@ -10,15 +10,15 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1069 #include "xfs_log_format.h"
1070 #include "xfs_trans_resv.h"
1071 #include "xfs_bit.h"
1072-#include "xfs_mount.h"
1073-#include "xfs_inode.h"
1074-#include "xfs_trans.h"
1075+#include "include/xfs_mount.h"
1076+#include "include/xfs_inode.h"
1077+#include "include/xfs_trans.h"
1078 #include "xfs_alloc.h"
1079 #include "xfs_btree.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1080 #include "xfs_btree_staging.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1081 #include "xfs_bmap_btree.h"
1082 #include "xfs_bmap.h"
1083-#include "xfs_trace.h"
1084+#include "include/xfs_trace.h"
1085 #include "xfs_rmap.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1086 #include "xfs_ag.h"
1087 #include "xfs_quota_defs.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1088diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1089index a91441b4..70d01d37 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1090--- a/libxfs/xfs_btree.c
1091+++ b/libxfs/xfs_btree.c
1092@@ -10,12 +10,12 @@
1093 #include "xfs_log_format.h"
1094 #include "xfs_trans_resv.h"
1095 #include "xfs_bit.h"
1096-#include "xfs_mount.h"
1097-#include "xfs_inode.h"
1098-#include "xfs_trans.h"
1099+#include "include/xfs_mount.h"
1100+#include "include/xfs_inode.h"
1101+#include "include/xfs_trans.h"
1102 #include "xfs_btree.h"
1103 #include "xfs_errortag.h"
1104-#include "xfs_trace.h"
1105+#include "include/xfs_trace.h"
1106 #include "xfs_alloc.h"
1107 #include "xfs_btree_staging.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1108 #include "xfs_ag.h"
1109diff --git a/libxfs/xfs_btree_mem.c b/libxfs/xfs_btree_mem.c
1110index ae9302b9..1a78a4c5 100644
1111--- a/libxfs/xfs_btree_mem.c
1112+++ b/libxfs/xfs_btree_mem.c
1113@@ -9,14 +9,14 @@
1114 #include "xfs_format.h"
1115 #include "xfs_log_format.h"
1116 #include "xfs_trans_resv.h"
1117-#include "xfs_mount.h"
1118-#include "xfs_trans.h"
1119+#include "include/xfs_mount.h"
1120+#include "include/xfs_trans.h"
1121 #include "xfs_btree.h"
1122 #include "xfile.h"
1123 #include "buf_mem.h"
1124 #include "xfs_btree_mem.h"
1125 #include "xfs_ag.h"
1126-#include "xfs_trace.h"
1127+#include "include/xfs_trace.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1128
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1129 /* Set the root of an in-memory btree. */
1130 void
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1131diff --git a/libxfs/xfs_btree_staging.c b/libxfs/xfs_btree_staging.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1132index 2f5b1d0b..90b7320c 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1133--- a/libxfs/xfs_btree_staging.c
1134+++ b/libxfs/xfs_btree_staging.c
1135@@ -10,11 +10,11 @@
1136 #include "xfs_log_format.h"
1137 #include "xfs_trans_resv.h"
1138 #include "xfs_bit.h"
1139-#include "xfs_mount.h"
1140-#include "xfs_inode.h"
1141-#include "xfs_trans.h"
1142+#include "include/xfs_mount.h"
1143+#include "include/xfs_inode.h"
1144+#include "include/xfs_trans.h"
1145 #include "xfs_btree.h"
1146-#include "xfs_trace.h"
1147+#include "include/xfs_trace.h"
1148 #include "xfs_btree_staging.h"
1149
1150 /*
1151diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1152index 8ace7622..65045144 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1153--- a/libxfs/xfs_da_btree.c
1154+++ b/libxfs/xfs_da_btree.c
1155@@ -11,14 +11,14 @@
1156 #include "xfs_log_format.h"
1157 #include "xfs_trans_resv.h"
1158 #include "xfs_bit.h"
1159-#include "xfs_mount.h"
1160-#include "xfs_inode.h"
1161+#include "include/xfs_mount.h"
1162+#include "include/xfs_inode.h"
1163 #include "xfs_dir2.h"
1164 #include "xfs_dir2_priv.h"
1165-#include "xfs_trans.h"
1166+#include "include/xfs_trans.h"
1167 #include "xfs_bmap.h"
1168 #include "xfs_attr_leaf.h"
1169-#include "xfs_trace.h"
1170+#include "include/xfs_trace.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1171 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1172
1173 /*
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1174diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1175index b80ac04a..ab711c67 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1176--- a/libxfs/xfs_defer.c
1177+++ b/libxfs/xfs_defer.c
1178@@ -9,11 +9,11 @@
1179 #include "xfs_format.h"
1180 #include "xfs_log_format.h"
1181 #include "xfs_trans_resv.h"
1182-#include "xfs_mount.h"
1183+#include "include/xfs_mount.h"
1184 #include "xfs_defer.h"
1185-#include "xfs_trans.h"
1186-#include "xfs_inode.h"
1187-#include "xfs_trace.h"
1188+#include "include/xfs_trans.h"
1189+#include "include/xfs_inode.h"
1190+#include "include/xfs_trace.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1191 #include "xfs_rmap.h"
1192 #include "xfs_refcount.h"
1193 #include "xfs_bmap.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1194diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1195index 530c3e22..0bdb8ade 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1196--- a/libxfs/xfs_dir2.c
1197+++ b/libxfs/xfs_dir2.c
1198@@ -9,14 +9,14 @@
1199 #include "xfs_format.h"
1200 #include "xfs_log_format.h"
1201 #include "xfs_trans_resv.h"
1202-#include "xfs_mount.h"
1203-#include "xfs_inode.h"
1204-#include "xfs_trans.h"
1205+#include "include/xfs_mount.h"
1206+#include "include/xfs_inode.h"
1207+#include "include/xfs_trans.h"
1208 #include "xfs_bmap.h"
1209 #include "xfs_dir2.h"
1210 #include "xfs_dir2_priv.h"
1211 #include "xfs_errortag.h"
1212-#include "xfs_trace.h"
1213+#include "include/xfs_trace.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1214 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1215
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1216 const struct xfs_name xfs_name_dotdot = {
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1217diff --git a/libxfs/xfs_dir2_block.c b/libxfs/xfs_dir2_block.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1218index 9d87735e..3cbe4ce5 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1219--- a/libxfs/xfs_dir2_block.c
1220+++ b/libxfs/xfs_dir2_block.c
1221@@ -10,13 +10,13 @@
1222 #include "xfs_format.h"
1223 #include "xfs_log_format.h"
1224 #include "xfs_trans_resv.h"
1225-#include "xfs_mount.h"
1226-#include "xfs_inode.h"
1227-#include "xfs_trans.h"
1228+#include "include/xfs_mount.h"
1229+#include "include/xfs_inode.h"
1230+#include "include/xfs_trans.h"
1231 #include "xfs_bmap.h"
1232 #include "xfs_dir2.h"
1233 #include "xfs_dir2_priv.h"
1234-#include "xfs_trace.h"
1235+#include "include/xfs_trace.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1236 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1237
1238 /*
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1239diff --git a/libxfs/xfs_dir2_data.c b/libxfs/xfs_dir2_data.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1240index aaf3f62a..fca7f511 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1241--- a/libxfs/xfs_dir2_data.c
1242+++ b/libxfs/xfs_dir2_data.c
1243@@ -10,11 +10,11 @@
1244 #include "xfs_format.h"
1245 #include "xfs_log_format.h"
1246 #include "xfs_trans_resv.h"
1247-#include "xfs_mount.h"
1248-#include "xfs_inode.h"
1249+#include "include/xfs_mount.h"
1250+#include "include/xfs_inode.h"
1251 #include "xfs_dir2.h"
1252 #include "xfs_dir2_priv.h"
1253-#include "xfs_trans.h"
1254+#include "include/xfs_trans.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1255 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1256
1257 static xfs_failaddr_t xfs_dir2_data_freefind_verify(
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1258diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1259index 80cea8a2..6ecf2bef 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1260--- a/libxfs/xfs_dir2_leaf.c
1261+++ b/libxfs/xfs_dir2_leaf.c
1262@@ -10,13 +10,13 @@
1263 #include "xfs_format.h"
1264 #include "xfs_log_format.h"
1265 #include "xfs_trans_resv.h"
1266-#include "xfs_mount.h"
1267-#include "xfs_inode.h"
1268+#include "include/xfs_mount.h"
1269+#include "include/xfs_inode.h"
1270 #include "xfs_bmap.h"
1271 #include "xfs_dir2.h"
1272 #include "xfs_dir2_priv.h"
1273-#include "xfs_trace.h"
1274-#include "xfs_trans.h"
1275+#include "include/xfs_trace.h"
1276+#include "include/xfs_trans.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1277 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1278
1279 /*
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1280diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1281index 44c8f3f2..91bfdb54 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1282--- a/libxfs/xfs_dir2_node.c
1283+++ b/libxfs/xfs_dir2_node.c
1284@@ -10,13 +10,13 @@
1285 #include "xfs_format.h"
1286 #include "xfs_log_format.h"
1287 #include "xfs_trans_resv.h"
1288-#include "xfs_mount.h"
1289-#include "xfs_inode.h"
1290+#include "include/xfs_mount.h"
1291+#include "include/xfs_inode.h"
1292 #include "xfs_bmap.h"
1293 #include "xfs_dir2.h"
1294 #include "xfs_dir2_priv.h"
1295-#include "xfs_trace.h"
1296-#include "xfs_trans.h"
1297+#include "include/xfs_trace.h"
1298+#include "include/xfs_trans.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1299 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1300
1301 /*
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1302diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1303index aaf73cd3..d3684ace 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1304--- a/libxfs/xfs_dir2_sf.c
1305+++ b/libxfs/xfs_dir2_sf.c
1306@@ -9,12 +9,12 @@
1307 #include "xfs_format.h"
1308 #include "xfs_log_format.h"
1309 #include "xfs_trans_resv.h"
1310-#include "xfs_mount.h"
1311-#include "xfs_inode.h"
1312-#include "xfs_trans.h"
1313+#include "include/xfs_mount.h"
1314+#include "include/xfs_inode.h"
1315+#include "include/xfs_trans.h"
1316 #include "xfs_dir2.h"
1317 #include "xfs_dir2_priv.h"
1318-#include "xfs_trace.h"
1319+#include "include/xfs_trace.h"
1320
1321 /*
1322 * Prototypes for internal functions.
1323diff --git a/libxfs/xfs_dquot_buf.c b/libxfs/xfs_dquot_buf.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1324index db603cab..ec35baf0 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1325--- a/libxfs/xfs_dquot_buf.c
1326+++ b/libxfs/xfs_dquot_buf.c
1327@@ -10,10 +10,10 @@
1328 #include "xfs_format.h"
1329 #include "xfs_log_format.h"
1330 #include "xfs_trans_resv.h"
1331-#include "xfs_mount.h"
1332+#include "include/xfs_mount.h"
1333 #include "xfs_quota_defs.h"
1334-#include "xfs_inode.h"
1335-#include "xfs_trans.h"
1336+#include "include/xfs_inode.h"
1337+#include "include/xfs_trans.h"
1338
1339 int
1340 xfs_calc_dquots_per_chunk(
1341diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1342index c30e7683..55e2a44e 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1343--- a/libxfs/xfs_ialloc.c
1344+++ b/libxfs/xfs_ialloc.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1345@@ -10,16 +10,16 @@
1346 #include "xfs_log_format.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1347 #include "xfs_trans_resv.h"
1348 #include "xfs_bit.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1349-#include "xfs_mount.h"
1350-#include "xfs_inode.h"
1351+#include "include/xfs_mount.h"
1352+#include "include/xfs_inode.h"
1353 #include "xfs_btree.h"
1354 #include "xfs_ialloc.h"
1355 #include "xfs_ialloc_btree.h"
1356 #include "xfs_alloc.h"
1357 #include "xfs_errortag.h"
1358 #include "xfs_bmap.h"
1359-#include "xfs_trans.h"
1360-#include "xfs_trace.h"
1361+#include "include/xfs_trans.h"
1362+#include "include/xfs_trace.h"
1363 #include "xfs_rmap.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1364 #include "xfs_ag.h"
1365 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1366diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1367index 58c520ec..dd081fd8 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1368--- a/libxfs/xfs_ialloc_btree.c
1369+++ b/libxfs/xfs_ialloc_btree.c
1370@@ -10,14 +10,14 @@
1371 #include "xfs_log_format.h"
1372 #include "xfs_trans_resv.h"
1373 #include "xfs_bit.h"
1374-#include "xfs_mount.h"
1375+#include "include/xfs_mount.h"
1376 #include "xfs_btree.h"
1377 #include "xfs_btree_staging.h"
1378 #include "xfs_ialloc.h"
1379 #include "xfs_ialloc_btree.h"
1380 #include "xfs_alloc.h"
1381-#include "xfs_trace.h"
1382-#include "xfs_trans.h"
1383+#include "include/xfs_trace.h"
1384+#include "include/xfs_trans.h"
1385 #include "xfs_rmap.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1386 #include "xfs_ag.h"
1387 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1388diff --git a/libxfs/xfs_iext_tree.c b/libxfs/xfs_iext_tree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1389index cdbb72d6..b840ab0f 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1390--- a/libxfs/xfs_iext_tree.c
1391+++ b/libxfs/xfs_iext_tree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1392@@ -9,9 +9,9 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1393 #include "xfs_bit.h"
1394 #include "xfs_log_format.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1395 #include "xfs_trans_resv.h"
1396-#include "xfs_mount.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1397-#include "xfs_inode.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1398-#include "xfs_trace.h"
1399+#include "include/xfs_mount.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1400+#include "include/xfs_inode.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1401+#include "include/xfs_trace.h"
1402
1403 /*
1404 * In-core extent record layout:
1405diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1406index 82cf64db..cf3854a7 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1407--- a/libxfs/xfs_inode_buf.c
1408+++ b/libxfs/xfs_inode_buf.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1409@@ -9,11 +9,11 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1410 #include "xfs_format.h"
1411 #include "xfs_log_format.h"
1412 #include "xfs_trans_resv.h"
1413-#include "xfs_mount.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1414+#include "include/xfs_mount.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1415 #include "xfs_ag.h"
1416-#include "xfs_inode.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1417+#include "include/xfs_inode.h"
1418 #include "xfs_errortag.h"
1419-#include "xfs_trans.h"
1420+#include "include/xfs_trans.h"
1421 #include "xfs_ialloc.h"
1422 #include "xfs_dir2.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1423 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1424diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1425index d9f0a21a..f5f5b127 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1426--- a/libxfs/xfs_inode_fork.c
1427+++ b/libxfs/xfs_inode_fork.c
1428@@ -10,13 +10,13 @@
1429 #include "xfs_format.h"
1430 #include "xfs_log_format.h"
1431 #include "xfs_trans_resv.h"
1432-#include "xfs_mount.h"
1433-#include "xfs_inode.h"
1434-#include "xfs_trans.h"
1435+#include "include/xfs_mount.h"
1436+#include "include/xfs_inode.h"
1437+#include "include/xfs_trans.h"
1438 #include "xfs_btree.h"
1439 #include "xfs_bmap_btree.h"
1440 #include "xfs_bmap.h"
1441-#include "xfs_trace.h"
1442+#include "include/xfs_trace.h"
1443 #include "xfs_da_format.h"
1444 #include "xfs_da_btree.h"
1445 #include "xfs_dir2_priv.h"
1446diff --git a/libxfs/xfs_log_rlimit.c b/libxfs/xfs_log_rlimit.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1447index cba24493..4315f039 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1448--- a/libxfs/xfs_log_rlimit.c
1449+++ b/libxfs/xfs_log_rlimit.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1450@@ -9,12 +9,12 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1451 #include "xfs_format.h"
1452 #include "xfs_log_format.h"
1453 #include "xfs_trans_resv.h"
1454-#include "xfs_mount.h"
1455+#include "include/xfs_mount.h"
1456 #include "xfs_da_format.h"
1457 #include "xfs_trans_space.h"
1458 #include "xfs_da_btree.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1459 #include "xfs_bmap_btree.h"
1460-#include "xfs_trace.h"
1461+#include "include/xfs_trace.h"
1462
1463 /*
1464 * Calculate the maximum length in bytes that would be required for a local
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1465diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1466index 47049488..04425043 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1467--- a/libxfs/xfs_refcount.c
1468+++ b/libxfs/xfs_refcount.c
1469@@ -9,15 +9,15 @@
1470 #include "xfs_format.h"
1471 #include "xfs_log_format.h"
1472 #include "xfs_trans_resv.h"
1473-#include "xfs_mount.h"
1474+#include "include/xfs_mount.h"
1475 #include "xfs_defer.h"
1476 #include "xfs_btree.h"
1477 #include "xfs_bmap.h"
1478 #include "xfs_refcount_btree.h"
1479 #include "xfs_alloc.h"
1480 #include "xfs_errortag.h"
1481-#include "xfs_trace.h"
1482-#include "xfs_trans.h"
1483+#include "include/xfs_trace.h"
1484+#include "include/xfs_trans.h"
1485 #include "xfs_bit.h"
1486 #include "xfs_refcount.h"
1487 #include "xfs_rmap.h"
1488diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1489index 362b2a2d..77edeb0d 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1490--- a/libxfs/xfs_refcount_btree.c
1491+++ b/libxfs/xfs_refcount_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1492@@ -9,14 +9,14 @@
1493 #include "xfs_format.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1494 #include "xfs_log_format.h"
1495 #include "xfs_trans_resv.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1496-#include "xfs_mount.h"
1497+#include "include/xfs_mount.h"
1498 #include "xfs_btree.h"
1499 #include "xfs_btree_staging.h"
1500 #include "xfs_refcount_btree.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1501 #include "xfs_refcount.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1502 #include "xfs_alloc.h"
1503-#include "xfs_trace.h"
1504-#include "xfs_trans.h"
1505+#include "include/xfs_trace.h"
1506+#include "include/xfs_trans.h"
1507 #include "xfs_bit.h"
1508 #include "xfs_rmap.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1509 #include "xfs_ag.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1510diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1511index c3195e53..8fb2f2b0 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1512--- a/libxfs/xfs_rmap.c
1513+++ b/libxfs/xfs_rmap.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1514@@ -10,17 +10,17 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1515 #include "xfs_log_format.h"
1516 #include "xfs_trans_resv.h"
1517 #include "xfs_bit.h"
1518-#include "xfs_mount.h"
1519+#include "include/xfs_mount.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1520 #include "xfs_sb.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1521 #include "xfs_defer.h"
1522 #include "xfs_btree.h"
1523-#include "xfs_trans.h"
1524+#include "include/xfs_trans.h"
1525 #include "xfs_alloc.h"
1526 #include "xfs_rmap.h"
1527 #include "xfs_rmap_btree.h"
1528-#include "xfs_trace.h"
1529+#include "include/xfs_trace.h"
1530 #include "xfs_errortag.h"
1531-#include "xfs_inode.h"
1532+#include "include/xfs_inode.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1533 #include "xfs_ag.h"
1534 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1535
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1536diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1537index a2730e29..d66cca63 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1538--- a/libxfs/xfs_rmap_btree.c
1539+++ b/libxfs/xfs_rmap_btree.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1540@@ -9,14 +9,14 @@
1541 #include "xfs_format.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1542 #include "xfs_log_format.h"
1543 #include "xfs_trans_resv.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1544-#include "xfs_mount.h"
1545-#include "xfs_trans.h"
1546+#include "include/xfs_mount.h"
1547+#include "include/xfs_trans.h"
1548 #include "xfs_alloc.h"
1549 #include "xfs_btree.h"
1550 #include "xfs_btree_staging.h"
1551 #include "xfs_rmap.h"
1552 #include "xfs_rmap_btree.h"
1553-#include "xfs_trace.h"
1554+#include "include/xfs_trace.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1555 #include "xfs_ag.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1556 #include "xfs_ag_resv.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1557 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1558diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1559index 543cfd2f..329d86b4 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1560--- a/libxfs/xfs_rtbitmap.c
1561+++ b/libxfs/xfs_rtbitmap.c
1562@@ -10,10 +10,10 @@
1563 #include "xfs_log_format.h"
1564 #include "xfs_trans_resv.h"
1565 #include "xfs_bit.h"
1566-#include "xfs_mount.h"
1567-#include "xfs_inode.h"
1568+#include "include/xfs_mount.h"
1569+#include "include/xfs_inode.h"
1570 #include "xfs_bmap.h"
1571-#include "xfs_trans.h"
1572+#include "include/xfs_trans.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1573 #include "xfs_rtbitmap.h"
1574 #include "xfs_health.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1575
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1576diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1577index 895d646b..45153e91 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1578--- a/libxfs/xfs_sb.c
1579+++ b/libxfs/xfs_sb.c
1580@@ -11,11 +11,11 @@
1581 #include "xfs_trans_resv.h"
1582 #include "xfs_bit.h"
1583 #include "xfs_sb.h"
1584-#include "xfs_mount.h"
1585+#include "include/xfs_mount.h"
1586 #include "xfs_ialloc.h"
1587 #include "xfs_alloc.h"
1588-#include "xfs_trace.h"
1589-#include "xfs_trans.h"
1590+#include "include/xfs_trace.h"
1591+#include "include/xfs_trans.h"
1592 #include "xfs_bmap_btree.h"
1593 #include "xfs_alloc_btree.h"
1594 #include "xfs_rmap_btree.h"
1595diff --git a/libxfs/xfs_symlink_remote.c b/libxfs/xfs_symlink_remote.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1596index 875e03bc..c88318a6 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1597--- a/libxfs/xfs_symlink_remote.c
1598+++ b/libxfs/xfs_symlink_remote.c
1599@@ -10,9 +10,9 @@
1600 #include "xfs_log_format.h"
1601 #include "xfs_shared.h"
1602 #include "xfs_trans_resv.h"
1603-#include "xfs_mount.h"
1604-#include "xfs_inode.h"
1605-#include "xfs_trans.h"
1606+#include "include/xfs_mount.h"
1607+#include "include/xfs_inode.h"
1608+#include "include/xfs_trans.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1609 #include "xfs_symlink_remote.h"
1610 #include "xfs_bit.h"
1611 #include "xfs_bmap.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1612diff --git a/libxfs/xfs_trans_inode.c b/libxfs/xfs_trans_inode.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1613index f8484eb2..8d30af38 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1614--- a/libxfs/xfs_trans_inode.c
1615+++ b/libxfs/xfs_trans_inode.c
1616@@ -9,9 +9,9 @@
1617 #include "xfs_format.h"
1618 #include "xfs_log_format.h"
1619 #include "xfs_trans_resv.h"
1620-#include "xfs_mount.h"
1621-#include "xfs_inode.h"
1622-#include "xfs_trans.h"
1623+#include "include/xfs_mount.h"
1624+#include "include/xfs_inode.h"
1625+#include "include/xfs_trans.h"
1626
1627
1628 /*
1629diff --git a/libxfs/xfs_trans_resv.c b/libxfs/xfs_trans_resv.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1630index 82b3d152..24ae60a4 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1631--- a/libxfs/xfs_trans_resv.c
1632+++ b/libxfs/xfs_trans_resv.c
1633@@ -10,12 +10,12 @@
1634 #include "xfs_format.h"
1635 #include "xfs_log_format.h"
1636 #include "xfs_trans_resv.h"
1637-#include "xfs_mount.h"
1638+#include "include/xfs_mount.h"
1639 #include "xfs_da_format.h"
1640 #include "xfs_da_btree.h"
1641-#include "xfs_inode.h"
1642+#include "include/xfs_inode.h"
1643 #include "xfs_bmap_btree.h"
1644-#include "xfs_trans.h"
1645+#include "include/xfs_trans.h"
1646 #include "xfs_trans_space.h"
1647 #include "xfs_quota_defs.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1648 #include "xfs_rtbitmap.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1649diff --git a/libxfs/xfs_types.c b/libxfs/xfs_types.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1650index 74ab1965..8ed74f53 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1651--- a/libxfs/xfs_types.c
1652+++ b/libxfs/xfs_types.c
1653@@ -10,7 +10,7 @@
1654 #include "xfs_shared.h"
1655 #include "xfs_trans_resv.h"
1656 #include "xfs_bit.h"
1657-#include "xfs_mount.h"
1658+#include "include/xfs_mount.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1659 #include "xfs_ag.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1660
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1661
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1662diff --git a/mkfs/proto.c b/mkfs/proto.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1663index a923f9c1..cf59db31 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1664--- a/mkfs/proto.c
1665+++ b/mkfs/proto.c
1666@@ -4,7 +4,7 @@
1667 * All Rights Reserved.
1668 */
1669
1670-#include "libxfs.h"
1671+#include "include/libxfs.h"
1672 #include <sys/stat.h>
1673 #include "libfrog/convert.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1674 #include "proto.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1675diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1676index 6d2469c3..c8e4ec16 100644
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1677--- a/mkfs/xfs_mkfs.c
1678+++ b/mkfs/xfs_mkfs.c
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1679@@ -4,16 +4,16 @@
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1680 * All Rights Reserved.
1681 */
1682 #include "libfrog/util.h"
1683-#include "libxfs.h"
1684+#include "include/libxfs.h"
1685 #include <ctype.h>
1686-#include "xfs_multidisk.h"
1687-#include "libxcmd.h"
1688+#include "include/xfs_multidisk.h"
1689+#include "include/libxcmd.h"
1690 #include "libfrog/fsgeom.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1691 #include "libfrog/convert.h"
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]1692 #include "libfrog/crc32cselftest.h"
1693 #include "libfrog/dahashselftest.h"
1694 #include "proto.h"
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1695-#include <ini.h>
1696+#include "ini.h"
1697
1698 #define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog)))
1699 #define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog)))
1700--
Lorenz Brun688ee2b2024-08-21 17:38:46 +0200[diff] [blame]17012.44.1
Lorenz Brunddd6caf2021-03-04 17:16:04 +0100[diff] [blame]1702