summaryrefslogtreecommitdiffstats
path: root/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch')
-rw-r--r--meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch2082
1 files changed, 0 insertions, 2082 deletions
diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch b/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch
deleted file mode 100644
index a47c48707..000000000
--- a/meta-filesystems/recipes-utils/xfsprogs/files/0001-xfs-remove-double-underscore-integer-types.patch
+++ /dev/null
@@ -1,2082 +0,0 @@
1From 4a492e72515509ee702286a42afe7d8f89d37636 Mon Sep 17 00:00:00 2001
2From: "Darrick J. Wong" <darrick.wong@oracle.com>
3Date: Mon, 31 Jul 2017 15:08:10 -0500
4Subject: [PATCH] xfs: remove double-underscore integer types
5
6Source kernel commit: c8ce540db5f67d254aafb14b5d76422c62a906df
7
8This is a purely mechanical patch that removes the private
9__{u,}int{8,16,32,64}_t typedefs in favor of using the system
10{u,}int{8,16,32,64}_t typedefs. This is the sed script used to perform
11the transformation and fix the resulting whitespace and indentation
12errors:
13
14s/typedef\t__uint8_t/typedef __uint8_t\t/g
15s/typedef\t__uint/typedef __uint/g
16s/typedef\t__int\([0-9]*\)_t/typedef int\1_t\t/g
17s/__uint8_t\t/__uint8_t\t\t/g
18s/__uint/uint/g
19s/__int\([0-9]*\)_t\t/__int\1_t\t\t/g
20s/__int/int/g
21/^typedef.*int[0-9]*_t;$/d
22
23Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
24Reviewed-by: Christoph Hellwig <hch@lst.de>
25Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
26---
27 libxfs/libxfs_priv.h | 1 +
28 libxfs/xfs_alloc_btree.c | 20 ++--
29 libxfs/xfs_attr_remote.c | 8 +-
30 libxfs/xfs_attr_sf.h | 10 +-
31 libxfs/xfs_bit.h | 24 ++---
32 libxfs/xfs_bmap_btree.c | 8 +-
33 libxfs/xfs_btree.c | 22 ++--
34 libxfs/xfs_btree.h | 18 ++--
35 libxfs/xfs_cksum.h | 16 +--
36 libxfs/xfs_da_btree.c | 2 +-
37 libxfs/xfs_da_btree.h | 8 +-
38 libxfs/xfs_da_format.c | 28 ++---
39 libxfs/xfs_da_format.h | 64 +++++------
40 libxfs/xfs_dir2.h | 8 +-
41 libxfs/xfs_dir2_leaf.c | 12 +--
42 libxfs/xfs_dir2_priv.h | 2 +-
43 libxfs/xfs_dir2_sf.c | 4 +-
44 libxfs/xfs_format.h | 112 +++++++++----------
45 libxfs/xfs_fs.h | 12 +--
46 libxfs/xfs_ialloc.c | 6 +-
47 libxfs/xfs_ialloc_btree.c | 4 +-
48 libxfs/xfs_inode_buf.c | 2 +-
49 libxfs/xfs_inode_buf.h | 28 ++---
50 libxfs/xfs_log_format.h | 256 ++++++++++++++++++++++----------------------
51 libxfs/xfs_quota_defs.h | 4 +-
52 libxfs/xfs_refcount_btree.c | 8 +-
53 libxfs/xfs_rmap.c | 8 +-
54 libxfs/xfs_rmap.h | 8 +-
55 libxfs/xfs_rmap_btree.c | 30 +++---
56 libxfs/xfs_rtbitmap.c | 2 +-
57 libxfs/xfs_sb.c | 4 +-
58 libxfs/xfs_types.h | 46 ++++----
59 32 files changed, 393 insertions(+), 392 deletions(-)
60
61diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
62index 0b4c4890..b3cc7e53 100644
63--- a/libxfs/libxfs_priv.h
64+++ b/libxfs/libxfs_priv.h
65@@ -504,5 +504,6 @@ bool xfs_log_check_lsn(struct xfs_mount *, xfs_lsn_t);
66 #define XFS_STATS_INC_OFF(mp, off)
67 #define XFS_STATS_ADD_OFF(mp, off, val)
68
69+typedef unsigned char u8;
70
71 #endif /* __LIBXFS_INTERNAL_XFS_H__ */
72diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
73index e11d89a3..8e77e6e3 100644
74--- a/libxfs/xfs_alloc_btree.c
75+++ b/libxfs/xfs_alloc_btree.c
76@@ -251,7 +251,7 @@ xfs_allocbt_init_ptr_from_cur(
77 ptr->s = agf->agf_roots[cur->bc_btnum];
78 }
79
80-STATIC __int64_t
81+STATIC int64_t
82 xfs_bnobt_key_diff(
83 struct xfs_btree_cur *cur,
84 union xfs_btree_key *key)
85@@ -259,42 +259,42 @@ xfs_bnobt_key_diff(
86 xfs_alloc_rec_incore_t *rec = &cur->bc_rec.a;
87 xfs_alloc_key_t *kp = &key->alloc;
88
89- return (__int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock;
90+ return (int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock;
91 }
92
93-STATIC __int64_t
94+STATIC int64_t
95 xfs_cntbt_key_diff(
96 struct xfs_btree_cur *cur,
97 union xfs_btree_key *key)
98 {
99 xfs_alloc_rec_incore_t *rec = &cur->bc_rec.a;
100 xfs_alloc_key_t *kp = &key->alloc;
101- __int64_t diff;
102+ int64_t diff;
103
104- diff = (__int64_t)be32_to_cpu(kp->ar_blockcount) - rec->ar_blockcount;
105+ diff = (int64_t)be32_to_cpu(kp->ar_blockcount) - rec->ar_blockcount;
106 if (diff)
107 return diff;
108
109- return (__int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock;
110+ return (int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock;
111 }
112
113-STATIC __int64_t
114+STATIC int64_t
115 xfs_bnobt_diff_two_keys(
116 struct xfs_btree_cur *cur,
117 union xfs_btree_key *k1,
118 union xfs_btree_key *k2)
119 {
120- return (__int64_t)be32_to_cpu(k1->alloc.ar_startblock) -
121+ return (int64_t)be32_to_cpu(k1->alloc.ar_startblock) -
122 be32_to_cpu(k2->alloc.ar_startblock);
123 }
124
125-STATIC __int64_t
126+STATIC int64_t
127 xfs_cntbt_diff_two_keys(
128 struct xfs_btree_cur *cur,
129 union xfs_btree_key *k1,
130 union xfs_btree_key *k2)
131 {
132- __int64_t diff;
133+ int64_t diff;
134
135 diff = be32_to_cpu(k1->alloc.ar_blockcount) -
136 be32_to_cpu(k2->alloc.ar_blockcount);
137diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
138index abe17052..1f25e363 100644
139--- a/libxfs/xfs_attr_remote.c
140+++ b/libxfs/xfs_attr_remote.c
141@@ -248,7 +248,7 @@ xfs_attr_rmtval_copyout(
142 xfs_ino_t ino,
143 int *offset,
144 int *valuelen,
145- __uint8_t **dst)
146+ uint8_t **dst)
147 {
148 char *src = bp->b_addr;
149 xfs_daddr_t bno = bp->b_bn;
150@@ -296,7 +296,7 @@ xfs_attr_rmtval_copyin(
151 xfs_ino_t ino,
152 int *offset,
153 int *valuelen,
154- __uint8_t **src)
155+ uint8_t **src)
156 {
157 char *dst = bp->b_addr;
158 xfs_daddr_t bno = bp->b_bn;
159@@ -350,7 +350,7 @@ xfs_attr_rmtval_get(
160 struct xfs_mount *mp = args->dp->i_mount;
161 struct xfs_buf *bp;
162 xfs_dablk_t lblkno = args->rmtblkno;
163- __uint8_t *dst = args->value;
164+ uint8_t *dst = args->value;
165 int valuelen;
166 int nmap;
167 int error;
168@@ -416,7 +416,7 @@ xfs_attr_rmtval_set(
169 struct xfs_bmbt_irec map;
170 xfs_dablk_t lblkno;
171 xfs_fileoff_t lfileoff = 0;
172- __uint8_t *src = args->value;
173+ uint8_t *src = args->value;
174 int blkcnt;
175 int valuelen;
176 int nmap;
177diff --git a/libxfs/xfs_attr_sf.h b/libxfs/xfs_attr_sf.h
178index 90928bbe..afd684ae 100644
179--- a/libxfs/xfs_attr_sf.h
180+++ b/libxfs/xfs_attr_sf.h
181@@ -31,10 +31,10 @@ typedef struct xfs_attr_sf_entry xfs_attr_sf_entry_t;
182 * We generate this then sort it, attr_list() must return things in hash-order.
183 */
184 typedef struct xfs_attr_sf_sort {
185- __uint8_t entno; /* entry number in original list */
186- __uint8_t namelen; /* length of name value (no null) */
187- __uint8_t valuelen; /* length of value */
188- __uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */
189+ uint8_t entno; /* entry number in original list */
190+ uint8_t namelen; /* length of name value (no null) */
191+ uint8_t valuelen; /* length of value */
192+ uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */
193 xfs_dahash_t hash; /* this entry's hash value */
194 unsigned char *name; /* name value, pointer into buffer */
195 } xfs_attr_sf_sort_t;
196@@ -42,7 +42,7 @@ typedef struct xfs_attr_sf_sort {
197 #define XFS_ATTR_SF_ENTSIZE_BYNAME(nlen,vlen) /* space name/value uses */ \
198 (((int)sizeof(xfs_attr_sf_entry_t)-1 + (nlen)+(vlen)))
199 #define XFS_ATTR_SF_ENTSIZE_MAX /* max space for name&value */ \
200- ((1 << (NBBY*(int)sizeof(__uint8_t))) - 1)
201+ ((1 << (NBBY*(int)sizeof(uint8_t))) - 1)
202 #define XFS_ATTR_SF_ENTSIZE(sfep) /* space an entry uses */ \
203 ((int)sizeof(xfs_attr_sf_entry_t)-1 + (sfep)->namelen+(sfep)->valuelen)
204 #define XFS_ATTR_SF_NEXTENTRY(sfep) /* next entry in struct */ \
205diff --git a/libxfs/xfs_bit.h b/libxfs/xfs_bit.h
206index e1649c0d..61c6b202 100644
207--- a/libxfs/xfs_bit.h
208+++ b/libxfs/xfs_bit.h
209@@ -25,47 +25,47 @@
210 /*
211 * masks with n high/low bits set, 64-bit values
212 */
213-static inline __uint64_t xfs_mask64hi(int n)
214+static inline uint64_t xfs_mask64hi(int n)
215 {
216- return (__uint64_t)-1 << (64 - (n));
217+ return (uint64_t)-1 << (64 - (n));
218 }
219-static inline __uint32_t xfs_mask32lo(int n)
220+static inline uint32_t xfs_mask32lo(int n)
221 {
222- return ((__uint32_t)1 << (n)) - 1;
223+ return ((uint32_t)1 << (n)) - 1;
224 }
225-static inline __uint64_t xfs_mask64lo(int n)
226+static inline uint64_t xfs_mask64lo(int n)
227 {
228- return ((__uint64_t)1 << (n)) - 1;
229+ return ((uint64_t)1 << (n)) - 1;
230 }
231
232 /* Get high bit set out of 32-bit argument, -1 if none set */
233-static inline int xfs_highbit32(__uint32_t v)
234+static inline int xfs_highbit32(uint32_t v)
235 {
236 return fls(v) - 1;
237 }
238
239 /* Get high bit set out of 64-bit argument, -1 if none set */
240-static inline int xfs_highbit64(__uint64_t v)
241+static inline int xfs_highbit64(uint64_t v)
242 {
243 return fls64(v) - 1;
244 }
245
246 /* Get low bit set out of 32-bit argument, -1 if none set */
247-static inline int xfs_lowbit32(__uint32_t v)
248+static inline int xfs_lowbit32(uint32_t v)
249 {
250 return ffs(v) - 1;
251 }
252
253 /* Get low bit set out of 64-bit argument, -1 if none set */
254-static inline int xfs_lowbit64(__uint64_t v)
255+static inline int xfs_lowbit64(uint64_t v)
256 {
257- __uint32_t w = (__uint32_t)v;
258+ uint32_t w = (uint32_t)v;
259 int n = 0;
260
261 if (w) { /* lower bits */
262 n = ffs(w);
263 } else { /* upper bits */
264- w = (__uint32_t)(v >> 32);
265+ w = (uint32_t)(v >> 32);
266 if (w) {
267 n = ffs(w);
268 if (n)
269diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
270index c48cbec1..9ee40d8b 100644
271--- a/libxfs/xfs_bmap_btree.c
272+++ b/libxfs/xfs_bmap_btree.c
273@@ -91,8 +91,8 @@ xfs_bmdr_to_bmbt(
274 */
275 STATIC void
276 __xfs_bmbt_get_all(
277- __uint64_t l0,
278- __uint64_t l1,
279+ uint64_t l0,
280+ uint64_t l1,
281 xfs_bmbt_irec_t *s)
282 {
283 int ext_flag;
284@@ -585,12 +585,12 @@ xfs_bmbt_init_ptr_from_cur(
285 ptr->l = 0;
286 }
287
288-STATIC __int64_t
289+STATIC int64_t
290 xfs_bmbt_key_diff(
291 struct xfs_btree_cur *cur,
292 union xfs_btree_key *key)
293 {
294- return (__int64_t)be64_to_cpu(key->bmbt.br_startoff) -
295+ return (int64_t)be64_to_cpu(key->bmbt.br_startoff) -
296 cur->bc_rec.b.br_startoff;
297 }
298
299diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
300index 3d293520..56b50a5b 100644
301--- a/libxfs/xfs_btree.c
302+++ b/libxfs/xfs_btree.c
303@@ -39,7 +39,7 @@ kmem_zone_t *xfs_btree_cur_zone;
304 /*
305 * Btree magic numbers.
306 */
307-static const __uint32_t xfs_magics[2][XFS_BTNUM_MAX] = {
308+static const uint32_t xfs_magics[2][XFS_BTNUM_MAX] = {
309 { XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, 0, XFS_BMAP_MAGIC, XFS_IBT_MAGIC,
310 XFS_FIBT_MAGIC, 0 },
311 { XFS_ABTB_CRC_MAGIC, XFS_ABTC_CRC_MAGIC, XFS_RMAP_CRC_MAGIC,
312@@ -47,12 +47,12 @@ static const __uint32_t xfs_magics[2][XFS_BTNUM_MAX] = {
313 XFS_REFC_CRC_MAGIC }
314 };
315
316-__uint32_t
317+uint32_t
318 xfs_btree_magic(
319 int crc,
320 xfs_btnum_t btnum)
321 {
322- __uint32_t magic = xfs_magics[crc][btnum];
323+ uint32_t magic = xfs_magics[crc][btnum];
324
325 /* Ensure we asked for crc for crc-only magics. */
326 ASSERT(magic != 0);
327@@ -774,14 +774,14 @@ xfs_btree_lastrec(
328 */
329 void
330 xfs_btree_offsets(
331- __int64_t fields, /* bitmask of fields */
332+ int64_t fields, /* bitmask of fields */
333 const short *offsets, /* table of field offsets */
334 int nbits, /* number of bits to inspect */
335 int *first, /* output: first byte offset */
336 int *last) /* output: last byte offset */
337 {
338 int i; /* current bit number */
339- __int64_t imask; /* mask for current bit number */
340+ int64_t imask; /* mask for current bit number */
341
342 ASSERT(fields != 0);
343 /*
344@@ -1842,7 +1842,7 @@ xfs_btree_lookup(
345 int *stat) /* success/failure */
346 {
347 struct xfs_btree_block *block; /* current btree block */
348- __int64_t diff; /* difference for the current key */
349+ int64_t diff; /* difference for the current key */
350 int error; /* error return value */
351 int keyno; /* current key number */
352 int level; /* level in the btree */
353@@ -4435,7 +4435,7 @@ xfs_btree_visit_blocks(
354 * recovery completion writes the changes to disk.
355 */
356 struct xfs_btree_block_change_owner_info {
357- __uint64_t new_owner;
358+ uint64_t new_owner;
359 struct list_head *buffer_list;
360 };
361
362@@ -4481,7 +4481,7 @@ xfs_btree_block_change_owner(
363 int
364 xfs_btree_change_owner(
365 struct xfs_btree_cur *cur,
366- __uint64_t new_owner,
367+ uint64_t new_owner,
368 struct list_head *buffer_list)
369 {
370 struct xfs_btree_block_change_owner_info bbcoi;
371@@ -4585,7 +4585,7 @@ xfs_btree_simple_query_range(
372 {
373 union xfs_btree_rec *recp;
374 union xfs_btree_key rec_key;
375- __int64_t diff;
376+ int64_t diff;
377 int stat;
378 bool firstrec = true;
379 int error;
380@@ -4682,8 +4682,8 @@ xfs_btree_overlapped_query_range(
381 union xfs_btree_key *hkp;
382 union xfs_btree_rec *recp;
383 struct xfs_btree_block *block;
384- __int64_t ldiff;
385- __int64_t hdiff;
386+ int64_t ldiff;
387+ int64_t hdiff;
388 int level;
389 struct xfs_buf *bp;
390 int i;
391diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
392index 05cf35b5..3c1fed23 100644
393--- a/libxfs/xfs_btree.h
394+++ b/libxfs/xfs_btree.h
395@@ -76,7 +76,7 @@ union xfs_btree_rec {
396 #define XFS_BTNUM_RMAP ((xfs_btnum_t)XFS_BTNUM_RMAPi)
397 #define XFS_BTNUM_REFC ((xfs_btnum_t)XFS_BTNUM_REFCi)
398
399-__uint32_t xfs_btree_magic(int crc, xfs_btnum_t btnum);
400+uint32_t xfs_btree_magic(int crc, xfs_btnum_t btnum);
401
402 /*
403 * For logging record fields.
404@@ -150,14 +150,14 @@ struct xfs_btree_ops {
405 union xfs_btree_rec *rec);
406
407 /* difference between key value and cursor value */
408- __int64_t (*key_diff)(struct xfs_btree_cur *cur,
409+ int64_t (*key_diff)(struct xfs_btree_cur *cur,
410 union xfs_btree_key *key);
411
412 /*
413 * Difference between key2 and key1 -- positive if key1 > key2,
414 * negative if key1 < key2, and zero if equal.
415 */
416- __int64_t (*diff_two_keys)(struct xfs_btree_cur *cur,
417+ int64_t (*diff_two_keys)(struct xfs_btree_cur *cur,
418 union xfs_btree_key *key1,
419 union xfs_btree_key *key2);
420
421@@ -213,11 +213,11 @@ typedef struct xfs_btree_cur
422 union xfs_btree_irec bc_rec; /* current insert/search record value */
423 struct xfs_buf *bc_bufs[XFS_BTREE_MAXLEVELS]; /* buf ptr per level */
424 int bc_ptrs[XFS_BTREE_MAXLEVELS]; /* key/record # */
425- __uint8_t bc_ra[XFS_BTREE_MAXLEVELS]; /* readahead bits */
426+ uint8_t bc_ra[XFS_BTREE_MAXLEVELS]; /* readahead bits */
427 #define XFS_BTCUR_LEFTRA 1 /* left sibling has been read-ahead */
428 #define XFS_BTCUR_RIGHTRA 2 /* right sibling has been read-ahead */
429- __uint8_t bc_nlevels; /* number of levels in the tree */
430- __uint8_t bc_blocklog; /* log2(blocksize) of btree blocks */
431+ uint8_t bc_nlevels; /* number of levels in the tree */
432+ uint8_t bc_blocklog; /* log2(blocksize) of btree blocks */
433 xfs_btnum_t bc_btnum; /* identifies which btree type */
434 int bc_statoff; /* offset of btre stats array */
435 union {
436@@ -330,7 +330,7 @@ xfs_btree_islastblock(
437 */
438 void
439 xfs_btree_offsets(
440- __int64_t fields, /* bitmask of fields */
441+ int64_t fields, /* bitmask of fields */
442 const short *offsets,/* table of field offsets */
443 int nbits, /* number of bits to inspect */
444 int *first, /* output: first byte offset */
445@@ -408,7 +408,7 @@ int xfs_btree_new_iroot(struct xfs_btree_cur *, int *, int *);
446 int xfs_btree_insert(struct xfs_btree_cur *, int *);
447 int xfs_btree_delete(struct xfs_btree_cur *, int *);
448 int xfs_btree_get_rec(struct xfs_btree_cur *, union xfs_btree_rec **, int *);
449-int xfs_btree_change_owner(struct xfs_btree_cur *cur, __uint64_t new_owner,
450+int xfs_btree_change_owner(struct xfs_btree_cur *cur, uint64_t new_owner,
451 struct list_head *buffer_list);
452
453 /*
454@@ -434,7 +434,7 @@ static inline int xfs_btree_get_numrecs(struct xfs_btree_block *block)
455 }
456
457 static inline void xfs_btree_set_numrecs(struct xfs_btree_block *block,
458- __uint16_t numrecs)
459+ uint16_t numrecs)
460 {
461 block->bb_numrecs = cpu_to_be16(numrecs);
462 }
463diff --git a/libxfs/xfs_cksum.h b/libxfs/xfs_cksum.h
464index a416c7cb..8211f48b 100644
465--- a/libxfs/xfs_cksum.h
466+++ b/libxfs/xfs_cksum.h
467@@ -1,7 +1,7 @@
468 #ifndef _XFS_CKSUM_H
469 #define _XFS_CKSUM_H 1
470
471-#define XFS_CRC_SEED (~(__uint32_t)0)
472+#define XFS_CRC_SEED (~(uint32_t)0)
473
474 /*
475 * Calculate the intermediate checksum for a buffer that has the CRC field
476@@ -9,11 +9,11 @@
477 * cksum_offset parameter. We do not modify the buffer during verification,
478 * hence we have to split the CRC calculation across the cksum_offset.
479 */
480-static inline __uint32_t
481+static inline uint32_t
482 xfs_start_cksum_safe(char *buffer, size_t length, unsigned long cksum_offset)
483 {
484- __uint32_t zero = 0;
485- __uint32_t crc;
486+ uint32_t zero = 0;
487+ uint32_t crc;
488
489 /* Calculate CRC up to the checksum. */
490 crc = crc32c(XFS_CRC_SEED, buffer, cksum_offset);
491@@ -30,7 +30,7 @@ xfs_start_cksum_safe(char *buffer, size_t length, unsigned long cksum_offset)
492 * Fast CRC method where the buffer is modified. Callers must have exclusive
493 * access to the buffer while the calculation takes place.
494 */
495-static inline __uint32_t
496+static inline uint32_t
497 xfs_start_cksum_update(char *buffer, size_t length, unsigned long cksum_offset)
498 {
499 /* zero the CRC field */
500@@ -48,7 +48,7 @@ xfs_start_cksum_update(char *buffer, size_t length, unsigned long cksum_offset)
501 * so that it is consistent on disk.
502 */
503 static inline __le32
504-xfs_end_cksum(__uint32_t crc)
505+xfs_end_cksum(uint32_t crc)
506 {
507 return ~cpu_to_le32(crc);
508 }
509@@ -62,7 +62,7 @@ xfs_end_cksum(__uint32_t crc)
510 static inline void
511 xfs_update_cksum(char *buffer, size_t length, unsigned long cksum_offset)
512 {
513- __uint32_t crc = xfs_start_cksum_update(buffer, length, cksum_offset);
514+ uint32_t crc = xfs_start_cksum_update(buffer, length, cksum_offset);
515
516 *(__le32 *)(buffer + cksum_offset) = xfs_end_cksum(crc);
517 }
518@@ -73,7 +73,7 @@ xfs_update_cksum(char *buffer, size_t length, unsigned long cksum_offset)
519 static inline int
520 xfs_verify_cksum(char *buffer, size_t length, unsigned long cksum_offset)
521 {
522- __uint32_t crc = xfs_start_cksum_safe(buffer, length, cksum_offset);
523+ uint32_t crc = xfs_start_cksum_safe(buffer, length, cksum_offset);
524
525 return *(__le32 *)(buffer + cksum_offset) == xfs_end_cksum(crc);
526 }
527diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
528index bc12f58f..08447be8 100644
529--- a/libxfs/xfs_da_btree.c
530+++ b/libxfs/xfs_da_btree.c
531@@ -1947,7 +1947,7 @@ xfs_da3_path_shift(
532 * This is implemented with some source-level loop unrolling.
533 */
534 xfs_dahash_t
535-xfs_da_hashname(const __uint8_t *name, int namelen)
536+xfs_da_hashname(const uint8_t *name, int namelen)
537 {
538 xfs_dahash_t hash;
539
540diff --git a/libxfs/xfs_da_btree.h b/libxfs/xfs_da_btree.h
541index 4e29cb6a..ae6de174 100644
542--- a/libxfs/xfs_da_btree.h
543+++ b/libxfs/xfs_da_btree.h
544@@ -60,10 +60,10 @@ enum xfs_dacmp {
545 */
546 typedef struct xfs_da_args {
547 struct xfs_da_geometry *geo; /* da block geometry */
548- const __uint8_t *name; /* string (maybe not NULL terminated) */
549+ const uint8_t *name; /* string (maybe not NULL terminated) */
550 int namelen; /* length of string (maybe no NULL) */
551- __uint8_t filetype; /* filetype of inode for directories */
552- __uint8_t *value; /* set of bytes (maybe contain NULLs) */
553+ uint8_t filetype; /* filetype of inode for directories */
554+ uint8_t *value; /* set of bytes (maybe contain NULLs) */
555 int valuelen; /* length of value */
556 int flags; /* argument flags (eg: ATTR_NOCREATE) */
557 xfs_dahash_t hashval; /* hash value of name */
558@@ -207,7 +207,7 @@ int xfs_da_reada_buf(struct xfs_inode *dp, xfs_dablk_t bno,
559 int xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno,
560 struct xfs_buf *dead_buf);
561
562-uint xfs_da_hashname(const __uint8_t *name_string, int name_length);
563+uint xfs_da_hashname(const uint8_t *name_string, int name_length);
564 enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args,
565 const unsigned char *name, int len);
566
567diff --git a/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c
568index 2b732b3c..f30004f6 100644
569--- a/libxfs/xfs_da_format.c
570+++ b/libxfs/xfs_da_format.c
571@@ -49,7 +49,7 @@ xfs_dir3_sf_entsize(
572 struct xfs_dir2_sf_hdr *hdr,
573 int len)
574 {
575- return xfs_dir2_sf_entsize(hdr, len) + sizeof(__uint8_t);
576+ return xfs_dir2_sf_entsize(hdr, len) + sizeof(uint8_t);
577 }
578
579 static struct xfs_dir2_sf_entry *
580@@ -77,7 +77,7 @@ xfs_dir3_sf_nextentry(
581 * not necessary. For non-filetype enable directories, the type is always
582 * unknown and we never store the value.
583 */
584-static __uint8_t
585+static uint8_t
586 xfs_dir2_sfe_get_ftype(
587 struct xfs_dir2_sf_entry *sfep)
588 {
589@@ -87,16 +87,16 @@ xfs_dir2_sfe_get_ftype(
590 static void
591 xfs_dir2_sfe_put_ftype(
592 struct xfs_dir2_sf_entry *sfep,
593- __uint8_t ftype)
594+ uint8_t ftype)
595 {
596 ASSERT(ftype < XFS_DIR3_FT_MAX);
597 }
598
599-static __uint8_t
600+static uint8_t
601 xfs_dir3_sfe_get_ftype(
602 struct xfs_dir2_sf_entry *sfep)
603 {
604- __uint8_t ftype;
605+ uint8_t ftype;
606
607 ftype = sfep->name[sfep->namelen];
608 if (ftype >= XFS_DIR3_FT_MAX)
609@@ -107,7 +107,7 @@ xfs_dir3_sfe_get_ftype(
610 static void
611 xfs_dir3_sfe_put_ftype(
612 struct xfs_dir2_sf_entry *sfep,
613- __uint8_t ftype)
614+ uint8_t ftype)
615 {
616 ASSERT(ftype < XFS_DIR3_FT_MAX);
617
618@@ -124,7 +124,7 @@ xfs_dir3_sfe_put_ftype(
619 static xfs_ino_t
620 xfs_dir2_sf_get_ino(
621 struct xfs_dir2_sf_hdr *hdr,
622- __uint8_t *from)
623+ uint8_t *from)
624 {
625 if (hdr->i8count)
626 return get_unaligned_be64(from) & 0x00ffffffffffffffULL;
627@@ -135,7 +135,7 @@ xfs_dir2_sf_get_ino(
628 static void
629 xfs_dir2_sf_put_ino(
630 struct xfs_dir2_sf_hdr *hdr,
631- __uint8_t *to,
632+ uint8_t *to,
633 xfs_ino_t ino)
634 {
635 ASSERT((ino & 0xff00000000000000ULL) == 0);
636@@ -225,7 +225,7 @@ xfs_dir3_sfe_put_ino(
637
638 #define XFS_DIR3_DATA_ENTSIZE(n) \
639 round_up((offsetof(struct xfs_dir2_data_entry, name[0]) + (n) + \
640- sizeof(xfs_dir2_data_off_t) + sizeof(__uint8_t)), \
641+ sizeof(xfs_dir2_data_off_t) + sizeof(uint8_t)), \
642 XFS_DIR2_DATA_ALIGN)
643
644 static int
645@@ -242,7 +242,7 @@ xfs_dir3_data_entsize(
646 return XFS_DIR3_DATA_ENTSIZE(n);
647 }
648
649-static __uint8_t
650+static uint8_t
651 xfs_dir2_data_get_ftype(
652 struct xfs_dir2_data_entry *dep)
653 {
654@@ -252,16 +252,16 @@ xfs_dir2_data_get_ftype(
655 static void
656 xfs_dir2_data_put_ftype(
657 struct xfs_dir2_data_entry *dep,
658- __uint8_t ftype)
659+ uint8_t ftype)
660 {
661 ASSERT(ftype < XFS_DIR3_FT_MAX);
662 }
663
664-static __uint8_t
665+static uint8_t
666 xfs_dir3_data_get_ftype(
667 struct xfs_dir2_data_entry *dep)
668 {
669- __uint8_t ftype = dep->name[dep->namelen];
670+ uint8_t ftype = dep->name[dep->namelen];
671
672 if (ftype >= XFS_DIR3_FT_MAX)
673 return XFS_DIR3_FT_UNKNOWN;
674@@ -271,7 +271,7 @@ xfs_dir3_data_get_ftype(
675 static void
676 xfs_dir3_data_put_ftype(
677 struct xfs_dir2_data_entry *dep,
678- __uint8_t type)
679+ uint8_t type)
680 {
681 ASSERT(type < XFS_DIR3_FT_MAX);
682 ASSERT(dep->namelen != 0);
683diff --git a/libxfs/xfs_da_format.h b/libxfs/xfs_da_format.h
684index 9a492a9e..3771edcb 100644
685--- a/libxfs/xfs_da_format.h
686+++ b/libxfs/xfs_da_format.h
687@@ -111,11 +111,11 @@ struct xfs_da3_intnode {
688 * appropriate.
689 */
690 struct xfs_da3_icnode_hdr {
691- __uint32_t forw;
692- __uint32_t back;
693- __uint16_t magic;
694- __uint16_t count;
695- __uint16_t level;
696+ uint32_t forw;
697+ uint32_t back;
698+ uint16_t magic;
699+ uint16_t count;
700+ uint16_t level;
701 };
702
703 /*
704@@ -187,14 +187,14 @@ struct xfs_da3_icnode_hdr {
705 /*
706 * Byte offset in data block and shortform entry.
707 */
708-typedef __uint16_t xfs_dir2_data_off_t;
709+typedef uint16_t xfs_dir2_data_off_t;
710 #define NULLDATAOFF 0xffffU
711 typedef uint xfs_dir2_data_aoff_t; /* argument form */
712
713 /*
714 * Offset in data space of a data entry.
715 */
716-typedef __uint32_t xfs_dir2_dataptr_t;
717+typedef uint32_t xfs_dir2_dataptr_t;
718 #define XFS_DIR2_MAX_DATAPTR ((xfs_dir2_dataptr_t)0xffffffff)
719 #define XFS_DIR2_NULL_DATAPTR ((xfs_dir2_dataptr_t)0)
720
721@@ -206,7 +206,7 @@ typedef xfs_off_t xfs_dir2_off_t;
722 /*
723 * Directory block number (logical dirblk in file)
724 */
725-typedef __uint32_t xfs_dir2_db_t;
726+typedef uint32_t xfs_dir2_db_t;
727
728 #define XFS_INO32_SIZE 4
729 #define XFS_INO64_SIZE 8
730@@ -226,9 +226,9 @@ typedef __uint32_t xfs_dir2_db_t;
731 * over them.
732 */
733 typedef struct xfs_dir2_sf_hdr {
734- __uint8_t count; /* count of entries */
735- __uint8_t i8count; /* count of 8-byte inode #s */
736- __uint8_t parent[8]; /* parent dir inode number */
737+ uint8_t count; /* count of entries */
738+ uint8_t i8count; /* count of 8-byte inode #s */
739+ uint8_t parent[8]; /* parent dir inode number */
740 } __packed xfs_dir2_sf_hdr_t;
741
742 typedef struct xfs_dir2_sf_entry {
743@@ -447,11 +447,11 @@ struct xfs_dir3_leaf_hdr {
744 };
745
746 struct xfs_dir3_icleaf_hdr {
747- __uint32_t forw;
748- __uint32_t back;
749- __uint16_t magic;
750- __uint16_t count;
751- __uint16_t stale;
752+ uint32_t forw;
753+ uint32_t back;
754+ uint16_t magic;
755+ uint16_t count;
756+ uint16_t stale;
757 };
758
759 /*
760@@ -538,10 +538,10 @@ struct xfs_dir3_free {
761 * xfs_dir3_free_hdr_from_disk/xfs_dir3_free_hdr_to_disk.
762 */
763 struct xfs_dir3_icfree_hdr {
764- __uint32_t magic;
765- __uint32_t firstdb;
766- __uint32_t nvalid;
767- __uint32_t nused;
768+ uint32_t magic;
769+ uint32_t firstdb;
770+ uint32_t nvalid;
771+ uint32_t nused;
772
773 };
774
775@@ -632,10 +632,10 @@ typedef struct xfs_attr_shortform {
776 __u8 padding;
777 } hdr;
778 struct xfs_attr_sf_entry {
779- __uint8_t namelen; /* actual length of name (no NULL) */
780- __uint8_t valuelen; /* actual length of value (no NULL) */
781- __uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */
782- __uint8_t nameval[1]; /* name & value bytes concatenated */
783+ uint8_t namelen; /* actual length of name (no NULL) */
784+ uint8_t valuelen; /* actual length of value (no NULL) */
785+ uint8_t flags; /* flags bits (see xfs_attr_leaf.h) */
786+ uint8_t nameval[1]; /* name & value bytes concatenated */
787 } list[1]; /* variable sized array */
788 } xfs_attr_shortform_t;
789
790@@ -725,22 +725,22 @@ struct xfs_attr3_leafblock {
791 * incore, neutral version of the attribute leaf header
792 */
793 struct xfs_attr3_icleaf_hdr {
794- __uint32_t forw;
795- __uint32_t back;
796- __uint16_t magic;
797- __uint16_t count;
798- __uint16_t usedbytes;
799+ uint32_t forw;
800+ uint32_t back;
801+ uint16_t magic;
802+ uint16_t count;
803+ uint16_t usedbytes;
804 /*
805 * firstused is 32-bit here instead of 16-bit like the on-disk variant
806 * to support maximum fsb size of 64k without overflow issues throughout
807 * the attr code. Instead, the overflow condition is handled on
808 * conversion to/from disk.
809 */
810- __uint32_t firstused;
811+ uint32_t firstused;
812 __u8 holes;
813 struct {
814- __uint16_t base;
815- __uint16_t size;
816+ uint16_t base;
817+ uint16_t size;
818 } freemap[XFS_ATTR_LEAF_MAPSIZE];
819 };
820
821diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h
822index d6e6d9d1..21c8f8bf 100644
823--- a/libxfs/xfs_dir2.h
824+++ b/libxfs/xfs_dir2.h
825@@ -47,9 +47,9 @@ struct xfs_dir_ops {
826 struct xfs_dir2_sf_entry *
827 (*sf_nextentry)(struct xfs_dir2_sf_hdr *hdr,
828 struct xfs_dir2_sf_entry *sfep);
829- __uint8_t (*sf_get_ftype)(struct xfs_dir2_sf_entry *sfep);
830+ uint8_t (*sf_get_ftype)(struct xfs_dir2_sf_entry *sfep);
831 void (*sf_put_ftype)(struct xfs_dir2_sf_entry *sfep,
832- __uint8_t ftype);
833+ uint8_t ftype);
834 xfs_ino_t (*sf_get_ino)(struct xfs_dir2_sf_hdr *hdr,
835 struct xfs_dir2_sf_entry *sfep);
836 void (*sf_put_ino)(struct xfs_dir2_sf_hdr *hdr,
837@@ -60,9 +60,9 @@ struct xfs_dir_ops {
838 xfs_ino_t ino);
839
840 int (*data_entsize)(int len);
841- __uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep);
842+ uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep);
843 void (*data_put_ftype)(struct xfs_dir2_data_entry *dep,
844- __uint8_t ftype);
845+ uint8_t ftype);
846 __be16 * (*data_entry_tag_p)(struct xfs_dir2_data_entry *dep);
847 struct xfs_dir2_data_free *
848 (*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr);
849diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c
850index f80d91fc..40a35b84 100644
851--- a/libxfs/xfs_dir2_leaf.c
852+++ b/libxfs/xfs_dir2_leaf.c
853@@ -142,7 +142,7 @@ xfs_dir3_leaf_check_int(
854 static bool
855 xfs_dir3_leaf_verify(
856 struct xfs_buf *bp,
857- __uint16_t magic)
858+ uint16_t magic)
859 {
860 struct xfs_mount *mp = bp->b_target->bt_mount;
861 struct xfs_dir2_leaf *leaf = bp->b_addr;
862@@ -151,7 +151,7 @@ xfs_dir3_leaf_verify(
863
864 if (xfs_sb_version_hascrc(&mp->m_sb)) {
865 struct xfs_dir3_leaf_hdr *leaf3 = bp->b_addr;
866- __uint16_t magic3;
867+ uint16_t magic3;
868
869 magic3 = (magic == XFS_DIR2_LEAF1_MAGIC) ? XFS_DIR3_LEAF1_MAGIC
870 : XFS_DIR3_LEAFN_MAGIC;
871@@ -175,7 +175,7 @@ xfs_dir3_leaf_verify(
872 static void
873 __read_verify(
874 struct xfs_buf *bp,
875- __uint16_t magic)
876+ uint16_t magic)
877 {
878 struct xfs_mount *mp = bp->b_target->bt_mount;
879
880@@ -192,7 +192,7 @@ __read_verify(
881 static void
882 __write_verify(
883 struct xfs_buf *bp,
884- __uint16_t magic)
885+ uint16_t magic)
886 {
887 struct xfs_mount *mp = bp->b_target->bt_mount;
888 struct xfs_buf_log_item *bip = bp->b_fspriv;
889@@ -296,7 +296,7 @@ xfs_dir3_leaf_init(
890 struct xfs_trans *tp,
891 struct xfs_buf *bp,
892 xfs_ino_t owner,
893- __uint16_t type)
894+ uint16_t type)
895 {
896 struct xfs_dir2_leaf *leaf = bp->b_addr;
897
898@@ -340,7 +340,7 @@ xfs_dir3_leaf_get_buf(
899 xfs_da_args_t *args,
900 xfs_dir2_db_t bno,
901 struct xfs_buf **bpp,
902- __uint16_t magic)
903+ uint16_t magic)
904 {
905 struct xfs_inode *dp = args->dp;
906 struct xfs_trans *tp = args->trans;
907diff --git a/libxfs/xfs_dir2_priv.h b/libxfs/xfs_dir2_priv.h
908index 39f8604f..011df4da 100644
909--- a/libxfs/xfs_dir2_priv.h
910+++ b/libxfs/xfs_dir2_priv.h
911@@ -69,7 +69,7 @@ extern void xfs_dir3_leaf_compact_x1(struct xfs_dir3_icleaf_hdr *leafhdr,
912 struct xfs_dir2_leaf_entry *ents, int *indexp,
913 int *lowstalep, int *highstalep, int *lowlogp, int *highlogp);
914 extern int xfs_dir3_leaf_get_buf(struct xfs_da_args *args, xfs_dir2_db_t bno,
915- struct xfs_buf **bpp, __uint16_t magic);
916+ struct xfs_buf **bpp, uint16_t magic);
917 extern void xfs_dir3_leaf_log_ents(struct xfs_da_args *args,
918 struct xfs_buf *bp, int first, int last);
919 extern void xfs_dir3_leaf_log_header(struct xfs_da_args *args,
920diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c
921index 195f816d..0c453988 100644
922--- a/libxfs/xfs_dir2_sf.c
923+++ b/libxfs/xfs_dir2_sf.c
924@@ -125,7 +125,7 @@ xfs_dir2_block_sfsize(
925 * Calculate the new size, see if we should give up yet.
926 */
927 size = xfs_dir2_sf_hdr_size(i8count) + /* header */
928- count * 3 * sizeof(__u8) + /* namelen + offset */
929+ count * 3 * sizeof(u8) + /* namelen + offset */
930 namelen + /* name */
931 (i8count ? /* inumber */
932 count * XFS_INO64_SIZE :
933@@ -645,7 +645,7 @@ xfs_dir2_sf_verify(
934 int offset;
935 int size;
936 int error;
937- __uint8_t filetype;
938+ uint8_t filetype;
939
940 ASSERT(ip->i_d.di_format == XFS_DINODE_FMT_LOCAL);
941 /*
942diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
943index 4c3ed1fd..a53f035f 100644
944--- a/libxfs/xfs_format.h
945+++ b/libxfs/xfs_format.h
946@@ -103,8 +103,8 @@ struct xfs_ifork;
947 * Must be padded to 64 bit alignment.
948 */
949 typedef struct xfs_sb {
950- __uint32_t sb_magicnum; /* magic number == XFS_SB_MAGIC */
951- __uint32_t sb_blocksize; /* logical block size, bytes */
952+ uint32_t sb_magicnum; /* magic number == XFS_SB_MAGIC */
953+ uint32_t sb_blocksize; /* logical block size, bytes */
954 xfs_rfsblock_t sb_dblocks; /* number of data blocks */
955 xfs_rfsblock_t sb_rblocks; /* number of realtime blocks */
956 xfs_rtblock_t sb_rextents; /* number of realtime extents */
957@@ -118,45 +118,45 @@ typedef struct xfs_sb {
958 xfs_agnumber_t sb_agcount; /* number of allocation groups */
959 xfs_extlen_t sb_rbmblocks; /* number of rt bitmap blocks */
960 xfs_extlen_t sb_logblocks; /* number of log blocks */
961- __uint16_t sb_versionnum; /* header version == XFS_SB_VERSION */
962- __uint16_t sb_sectsize; /* volume sector size, bytes */
963- __uint16_t sb_inodesize; /* inode size, bytes */
964- __uint16_t sb_inopblock; /* inodes per block */
965+ uint16_t sb_versionnum; /* header version == XFS_SB_VERSION */
966+ uint16_t sb_sectsize; /* volume sector size, bytes */
967+ uint16_t sb_inodesize; /* inode size, bytes */
968+ uint16_t sb_inopblock; /* inodes per block */
969 char sb_fname[12]; /* file system name */
970- __uint8_t sb_blocklog; /* log2 of sb_blocksize */
971- __uint8_t sb_sectlog; /* log2 of sb_sectsize */
972- __uint8_t sb_inodelog; /* log2 of sb_inodesize */
973- __uint8_t sb_inopblog; /* log2 of sb_inopblock */
974- __uint8_t sb_agblklog; /* log2 of sb_agblocks (rounded up) */
975- __uint8_t sb_rextslog; /* log2 of sb_rextents */
976- __uint8_t sb_inprogress; /* mkfs is in progress, don't mount */
977- __uint8_t sb_imax_pct; /* max % of fs for inode space */
978+ uint8_t sb_blocklog; /* log2 of sb_blocksize */
979+ uint8_t sb_sectlog; /* log2 of sb_sectsize */
980+ uint8_t sb_inodelog; /* log2 of sb_inodesize */
981+ uint8_t sb_inopblog; /* log2 of sb_inopblock */
982+ uint8_t sb_agblklog; /* log2 of sb_agblocks (rounded up) */
983+ uint8_t sb_rextslog; /* log2 of sb_rextents */
984+ uint8_t sb_inprogress; /* mkfs is in progress, don't mount */
985+ uint8_t sb_imax_pct; /* max % of fs for inode space */
986 /* statistics */
987 /*
988 * These fields must remain contiguous. If you really
989 * want to change their layout, make sure you fix the
990 * code in xfs_trans_apply_sb_deltas().
991 */
992- __uint64_t sb_icount; /* allocated inodes */
993- __uint64_t sb_ifree; /* free inodes */
994- __uint64_t sb_fdblocks; /* free data blocks */
995- __uint64_t sb_frextents; /* free realtime extents */
996+ uint64_t sb_icount; /* allocated inodes */
997+ uint64_t sb_ifree; /* free inodes */
998+ uint64_t sb_fdblocks; /* free data blocks */
999+ uint64_t sb_frextents; /* free realtime extents */
1000 /*
1001 * End contiguous fields.
1002 */
1003 xfs_ino_t sb_uquotino; /* user quota inode */
1004 xfs_ino_t sb_gquotino; /* group quota inode */
1005- __uint16_t sb_qflags; /* quota flags */
1006- __uint8_t sb_flags; /* misc. flags */
1007- __uint8_t sb_shared_vn; /* shared version number */
1008+ uint16_t sb_qflags; /* quota flags */
1009+ uint8_t sb_flags; /* misc. flags */
1010+ uint8_t sb_shared_vn; /* shared version number */
1011 xfs_extlen_t sb_inoalignmt; /* inode chunk alignment, fsblocks */
1012- __uint32_t sb_unit; /* stripe or raid unit */
1013- __uint32_t sb_width; /* stripe or raid width */
1014- __uint8_t sb_dirblklog; /* log2 of dir block size (fsbs) */
1015- __uint8_t sb_logsectlog; /* log2 of the log sector size */
1016- __uint16_t sb_logsectsize; /* sector size for the log, bytes */
1017- __uint32_t sb_logsunit; /* stripe unit size for the log */
1018- __uint32_t sb_features2; /* additional feature bits */
1019+ uint32_t sb_unit; /* stripe or raid unit */
1020+ uint32_t sb_width; /* stripe or raid width */
1021+ uint8_t sb_dirblklog; /* log2 of dir block size (fsbs) */
1022+ uint8_t sb_logsectlog; /* log2 of the log sector size */
1023+ uint16_t sb_logsectsize; /* sector size for the log, bytes */
1024+ uint32_t sb_logsunit; /* stripe unit size for the log */
1025+ uint32_t sb_features2; /* additional feature bits */
1026
1027 /*
1028 * bad features2 field as a result of failing to pad the sb structure to
1029@@ -167,17 +167,17 @@ typedef struct xfs_sb {
1030 * the value in sb_features2 when formatting the incore superblock to
1031 * the disk buffer.
1032 */
1033- __uint32_t sb_bad_features2;
1034+ uint32_t sb_bad_features2;
1035
1036 /* version 5 superblock fields start here */
1037
1038 /* feature masks */
1039- __uint32_t sb_features_compat;
1040- __uint32_t sb_features_ro_compat;
1041- __uint32_t sb_features_incompat;
1042- __uint32_t sb_features_log_incompat;
1043+ uint32_t sb_features_compat;
1044+ uint32_t sb_features_ro_compat;
1045+ uint32_t sb_features_incompat;
1046+ uint32_t sb_features_log_incompat;
1047
1048- __uint32_t sb_crc; /* superblock crc */
1049+ uint32_t sb_crc; /* superblock crc */
1050 xfs_extlen_t sb_spino_align; /* sparse inode chunk alignment */
1051
1052 xfs_ino_t sb_pquotino; /* project quota inode */
1053@@ -449,7 +449,7 @@ static inline void xfs_sb_version_addprojid32bit(struct xfs_sb *sbp)
1054 static inline bool
1055 xfs_sb_has_compat_feature(
1056 struct xfs_sb *sbp,
1057- __uint32_t feature)
1058+ uint32_t feature)
1059 {
1060 return (sbp->sb_features_compat & feature) != 0;
1061 }
1062@@ -465,7 +465,7 @@ xfs_sb_has_compat_feature(
1063 static inline bool
1064 xfs_sb_has_ro_compat_feature(
1065 struct xfs_sb *sbp,
1066- __uint32_t feature)
1067+ uint32_t feature)
1068 {
1069 return (sbp->sb_features_ro_compat & feature) != 0;
1070 }
1071@@ -482,7 +482,7 @@ xfs_sb_has_ro_compat_feature(
1072 static inline bool
1073 xfs_sb_has_incompat_feature(
1074 struct xfs_sb *sbp,
1075- __uint32_t feature)
1076+ uint32_t feature)
1077 {
1078 return (sbp->sb_features_incompat & feature) != 0;
1079 }
1080@@ -492,7 +492,7 @@ xfs_sb_has_incompat_feature(
1081 static inline bool
1082 xfs_sb_has_incompat_log_feature(
1083 struct xfs_sb *sbp,
1084- __uint32_t feature)
1085+ uint32_t feature)
1086 {
1087 return (sbp->sb_features_log_incompat & feature) != 0;
1088 }
1089@@ -594,8 +594,8 @@ xfs_is_quota_inode(struct xfs_sb *sbp, xfs_ino_t ino)
1090 */
1091 #define XFS_FSB_TO_B(mp,fsbno) ((xfs_fsize_t)(fsbno) << (mp)->m_sb.sb_blocklog)
1092 #define XFS_B_TO_FSB(mp,b) \
1093- ((((__uint64_t)(b)) + (mp)->m_blockmask) >> (mp)->m_sb.sb_blocklog)
1094-#define XFS_B_TO_FSBT(mp,b) (((__uint64_t)(b)) >> (mp)->m_sb.sb_blocklog)
1095+ ((((uint64_t)(b)) + (mp)->m_blockmask) >> (mp)->m_sb.sb_blocklog)
1096+#define XFS_B_TO_FSBT(mp,b) (((uint64_t)(b)) >> (mp)->m_sb.sb_blocklog)
1097 #define XFS_B_FSB_OFFSET(mp,b) ((b) & (mp)->m_blockmask)
1098
1099 /*
1100@@ -1072,7 +1072,7 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
1101 * next agno_log bits - ag number
1102 * high agno_log-agblklog-inopblog bits - 0
1103 */
1104-#define XFS_INO_MASK(k) (__uint32_t)((1ULL << (k)) - 1)
1105+#define XFS_INO_MASK(k) (uint32_t)((1ULL << (k)) - 1)
1106 #define XFS_INO_OFFSET_BITS(mp) (mp)->m_sb.sb_inopblog
1107 #define XFS_INO_AGBNO_BITS(mp) (mp)->m_sb.sb_agblklog
1108 #define XFS_INO_AGINO_BITS(mp) (mp)->m_agino_log
1109@@ -1269,16 +1269,16 @@ typedef __be32 xfs_alloc_ptr_t;
1110 #define XFS_FIBT_MAGIC 0x46494254 /* 'FIBT' */
1111 #define XFS_FIBT_CRC_MAGIC 0x46494233 /* 'FIB3' */
1112
1113-typedef __uint64_t xfs_inofree_t;
1114+typedef uint64_t xfs_inofree_t;
1115 #define XFS_INODES_PER_CHUNK (NBBY * sizeof(xfs_inofree_t))
1116 #define XFS_INODES_PER_CHUNK_LOG (XFS_NBBYLOG + 3)
1117 #define XFS_INOBT_ALL_FREE ((xfs_inofree_t)-1)
1118 #define XFS_INOBT_MASK(i) ((xfs_inofree_t)1 << (i))
1119
1120 #define XFS_INOBT_HOLEMASK_FULL 0 /* holemask for full chunk */
1121-#define XFS_INOBT_HOLEMASK_BITS (NBBY * sizeof(__uint16_t))
1122+#define XFS_INOBT_HOLEMASK_BITS (NBBY * sizeof(uint16_t))
1123 #define XFS_INODES_PER_HOLEMASK_BIT \
1124- (XFS_INODES_PER_CHUNK / (NBBY * sizeof(__uint16_t)))
1125+ (XFS_INODES_PER_CHUNK / (NBBY * sizeof(uint16_t)))
1126
1127 static inline xfs_inofree_t xfs_inobt_maskn(int i, int n)
1128 {
1129@@ -1312,9 +1312,9 @@ typedef struct xfs_inobt_rec {
1130
1131 typedef struct xfs_inobt_rec_incore {
1132 xfs_agino_t ir_startino; /* starting inode number */
1133- __uint16_t ir_holemask; /* hole mask for sparse chunks */
1134- __uint8_t ir_count; /* total inode count */
1135- __uint8_t ir_freecount; /* count of free inodes (set bits) */
1136+ uint16_t ir_holemask; /* hole mask for sparse chunks */
1137+ uint8_t ir_count; /* total inode count */
1138+ uint8_t ir_freecount; /* count of free inodes (set bits) */
1139 xfs_inofree_t ir_free; /* free inode mask */
1140 } xfs_inobt_rec_incore_t;
1141
1142@@ -1397,15 +1397,15 @@ struct xfs_rmap_rec {
1143 * rm_offset:54-60 aren't used and should be zero
1144 * rm_offset:0-53 is the block offset within the inode
1145 */
1146-#define XFS_RMAP_OFF_ATTR_FORK ((__uint64_t)1ULL << 63)
1147-#define XFS_RMAP_OFF_BMBT_BLOCK ((__uint64_t)1ULL << 62)
1148-#define XFS_RMAP_OFF_UNWRITTEN ((__uint64_t)1ULL << 61)
1149+#define XFS_RMAP_OFF_ATTR_FORK ((uint64_t)1ULL << 63)
1150+#define XFS_RMAP_OFF_BMBT_BLOCK ((uint64_t)1ULL << 62)
1151+#define XFS_RMAP_OFF_UNWRITTEN ((uint64_t)1ULL << 61)
1152
1153-#define XFS_RMAP_LEN_MAX ((__uint32_t)~0U)
1154+#define XFS_RMAP_LEN_MAX ((uint32_t)~0U)
1155 #define XFS_RMAP_OFF_FLAGS (XFS_RMAP_OFF_ATTR_FORK | \
1156 XFS_RMAP_OFF_BMBT_BLOCK | \
1157 XFS_RMAP_OFF_UNWRITTEN)
1158-#define XFS_RMAP_OFF_MASK ((__uint64_t)0x3FFFFFFFFFFFFFULL)
1159+#define XFS_RMAP_OFF_MASK ((uint64_t)0x3FFFFFFFFFFFFFULL)
1160
1161 #define XFS_RMAP_OFF(off) ((off) & XFS_RMAP_OFF_MASK)
1162
1163@@ -1431,8 +1431,8 @@ struct xfs_rmap_rec {
1164 struct xfs_rmap_irec {
1165 xfs_agblock_t rm_startblock; /* extent start block */
1166 xfs_extlen_t rm_blockcount; /* extent length */
1167- __uint64_t rm_owner; /* extent owner */
1168- __uint64_t rm_offset; /* offset within the owner */
1169+ uint64_t rm_owner; /* extent owner */
1170+ uint64_t rm_offset; /* offset within the owner */
1171 unsigned int rm_flags; /* state flags */
1172 };
1173
1174@@ -1544,11 +1544,11 @@ typedef struct xfs_bmbt_rec {
1175 __be64 l0, l1;
1176 } xfs_bmbt_rec_t;
1177
1178-typedef __uint64_t xfs_bmbt_rec_base_t; /* use this for casts */
1179+typedef uint64_t xfs_bmbt_rec_base_t; /* use this for casts */
1180 typedef xfs_bmbt_rec_t xfs_bmdr_rec_t;
1181
1182 typedef struct xfs_bmbt_rec_host {
1183- __uint64_t l0, l1;
1184+ uint64_t l0, l1;
1185 } xfs_bmbt_rec_host_t;
1186
1187 /*
1188diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
1189index 99f7f881..8a0c0eec 100644
1190--- a/libxfs/xfs_fs.h
1191+++ b/libxfs/xfs_fs.h
1192@@ -323,10 +323,10 @@ typedef struct xfs_bstat {
1193 * and using two 16bit values to hold new 32bit projid was choosen
1194 * to retain compatibility with "old" filesystems).
1195 */
1196-static inline __uint32_t
1197+static inline uint32_t
1198 bstat_get_projid(struct xfs_bstat *bs)
1199 {
1200- return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
1201+ return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo;
1202 }
1203
1204 /*
1205@@ -472,10 +472,10 @@ typedef struct xfs_handle {
1206 */
1207 typedef struct xfs_swapext
1208 {
1209- __int64_t sx_version; /* version */
1210+ int64_t sx_version; /* version */
1211 #define XFS_SX_VERSION 0
1212- __int64_t sx_fdtarget; /* fd of target file */
1213- __int64_t sx_fdtmp; /* fd of tmp file */
1214+ int64_t sx_fdtarget; /* fd of target file */
1215+ int64_t sx_fdtmp; /* fd of tmp file */
1216 xfs_off_t sx_offset; /* offset into file */
1217 xfs_off_t sx_length; /* leng from offset */
1218 char sx_pad[16]; /* pad space, unused */
1219@@ -562,7 +562,7 @@ typedef struct xfs_swapext
1220 #define XFS_IOC_ATTRLIST_BY_HANDLE _IOW ('X', 122, struct xfs_fsop_attrlist_handlereq)
1221 #define XFS_IOC_ATTRMULTI_BY_HANDLE _IOW ('X', 123, struct xfs_fsop_attrmulti_handlereq)
1222 #define XFS_IOC_FSGEOMETRY _IOR ('X', 124, struct xfs_fsop_geom)
1223-#define XFS_IOC_GOINGDOWN _IOR ('X', 125, __uint32_t)
1224+#define XFS_IOC_GOINGDOWN _IOR ('X', 125, uint32_t)
1225 /* XFS_IOC_GETFSUUID ---------- deprecated 140 */
1226
1227 /* reflink ioctls; these MUST match the btrfs ioctl definitions */
1228diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
1229index 55cc4507..8d245184 100644
1230--- a/libxfs/xfs_ialloc.c
1231+++ b/libxfs/xfs_ialloc.c
1232@@ -134,9 +134,9 @@ xfs_inobt_get_rec(
1233 STATIC int
1234 xfs_inobt_insert_rec(
1235 struct xfs_btree_cur *cur,
1236- __uint16_t holemask,
1237- __uint8_t count,
1238- __int32_t freecount,
1239+ uint16_t holemask,
1240+ uint8_t count,
1241+ int32_t freecount,
1242 xfs_inofree_t free,
1243 int *stat)
1244 {
1245diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c
1246index 7b4be766..5b281054 100644
1247--- a/libxfs/xfs_ialloc_btree.c
1248+++ b/libxfs/xfs_ialloc_btree.c
1249@@ -218,12 +218,12 @@ xfs_finobt_init_ptr_from_cur(
1250 ptr->s = agi->agi_free_root;
1251 }
1252
1253-STATIC __int64_t
1254+STATIC int64_t
1255 xfs_inobt_key_diff(
1256 struct xfs_btree_cur *cur,
1257 union xfs_btree_key *key)
1258 {
1259- return (__int64_t)be32_to_cpu(key->inobt.ir_startino) -
1260+ return (int64_t)be32_to_cpu(key->inobt.ir_startino) -
1261 cur->bc_rec.i.ir_startino;
1262 }
1263
1264diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
1265index 2972701d..fcc6fb8e 100644
1266--- a/libxfs/xfs_inode_buf.c
1267+++ b/libxfs/xfs_inode_buf.c
1268@@ -442,7 +442,7 @@ xfs_dinode_calc_crc(
1269 struct xfs_mount *mp,
1270 struct xfs_dinode *dip)
1271 {
1272- __uint32_t crc;
1273+ uint32_t crc;
1274
1275 if (dip->di_version < 3)
1276 return;
1277diff --git a/libxfs/xfs_inode_buf.h b/libxfs/xfs_inode_buf.h
1278index 6848a0af..0827d7de 100644
1279--- a/libxfs/xfs_inode_buf.h
1280+++ b/libxfs/xfs_inode_buf.h
1281@@ -28,26 +28,26 @@ struct xfs_dinode;
1282 * format specific structures at the appropriate time.
1283 */
1284 struct xfs_icdinode {
1285- __int8_t di_version; /* inode version */
1286- __int8_t di_format; /* format of di_c data */
1287- __uint16_t di_flushiter; /* incremented on flush */
1288- __uint32_t di_uid; /* owner's user id */
1289- __uint32_t di_gid; /* owner's group id */
1290- __uint16_t di_projid_lo; /* lower part of owner's project id */
1291- __uint16_t di_projid_hi; /* higher part of owner's project id */
1292+ int8_t di_version; /* inode version */
1293+ int8_t di_format; /* format of di_c data */
1294+ uint16_t di_flushiter; /* incremented on flush */
1295+ uint32_t di_uid; /* owner's user id */
1296+ uint32_t di_gid; /* owner's group id */
1297+ uint16_t di_projid_lo; /* lower part of owner's project id */
1298+ uint16_t di_projid_hi; /* higher part of owner's project id */
1299 xfs_fsize_t di_size; /* number of bytes in file */
1300 xfs_rfsblock_t di_nblocks; /* # of direct & btree blocks used */
1301 xfs_extlen_t di_extsize; /* basic/minimum extent size for file */
1302 xfs_extnum_t di_nextents; /* number of extents in data fork */
1303 xfs_aextnum_t di_anextents; /* number of extents in attribute fork*/
1304- __uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */
1305- __int8_t di_aformat; /* format of attr fork's data */
1306- __uint32_t di_dmevmask; /* DMIG event mask */
1307- __uint16_t di_dmstate; /* DMIG state info */
1308- __uint16_t di_flags; /* random flags, XFS_DIFLAG_... */
1309+ uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */
1310+ int8_t di_aformat; /* format of attr fork's data */
1311+ uint32_t di_dmevmask; /* DMIG event mask */
1312+ uint16_t di_dmstate; /* DMIG state info */
1313+ uint16_t di_flags; /* random flags, XFS_DIFLAG_... */
1314
1315- __uint64_t di_flags2; /* more random flags */
1316- __uint32_t di_cowextsize; /* basic cow extent size for file */
1317+ uint64_t di_flags2; /* more random flags */
1318+ uint32_t di_cowextsize; /* basic cow extent size for file */
1319
1320 xfs_ictimestamp_t di_crtime; /* time created */
1321 };
1322diff --git a/libxfs/xfs_log_format.h b/libxfs/xfs_log_format.h
1323index 7ae571f8..8372e9bc 100644
1324--- a/libxfs/xfs_log_format.h
1325+++ b/libxfs/xfs_log_format.h
1326@@ -31,7 +31,7 @@ struct xfs_trans_res;
1327 * through all the log items definitions and everything they encode into the
1328 * log.
1329 */
1330-typedef __uint32_t xlog_tid_t;
1331+typedef uint32_t xlog_tid_t;
1332
1333 #define XLOG_MIN_ICLOGS 2
1334 #define XLOG_MAX_ICLOGS 8
1335@@ -211,7 +211,7 @@ typedef struct xfs_log_iovec {
1336 typedef struct xfs_trans_header {
1337 uint th_magic; /* magic number */
1338 uint th_type; /* transaction type */
1339- __int32_t th_tid; /* transaction id (unused) */
1340+ int32_t th_tid; /* transaction id (unused) */
1341 uint th_num_items; /* num items logged by trans */
1342 } xfs_trans_header_t;
1343
1344@@ -265,52 +265,52 @@ typedef struct xfs_trans_header {
1345 * must be added on to the end.
1346 */
1347 typedef struct xfs_inode_log_format {
1348- __uint16_t ilf_type; /* inode log item type */
1349- __uint16_t ilf_size; /* size of this item */
1350- __uint32_t ilf_fields; /* flags for fields logged */
1351- __uint16_t ilf_asize; /* size of attr d/ext/root */
1352- __uint16_t ilf_dsize; /* size of data/ext/root */
1353- __uint64_t ilf_ino; /* inode number */
1354+ uint16_t ilf_type; /* inode log item type */
1355+ uint16_t ilf_size; /* size of this item */
1356+ uint32_t ilf_fields; /* flags for fields logged */
1357+ uint16_t ilf_asize; /* size of attr d/ext/root */
1358+ uint16_t ilf_dsize; /* size of data/ext/root */
1359+ uint64_t ilf_ino; /* inode number */
1360 union {
1361- __uint32_t ilfu_rdev; /* rdev value for dev inode*/
1362+ uint32_t ilfu_rdev; /* rdev value for dev inode*/
1363 uuid_t ilfu_uuid; /* mount point value */
1364 } ilf_u;
1365- __int64_t ilf_blkno; /* blkno of inode buffer */
1366- __int32_t ilf_len; /* len of inode buffer */
1367- __int32_t ilf_boffset; /* off of inode in buffer */
1368+ int64_t ilf_blkno; /* blkno of inode buffer */
1369+ int32_t ilf_len; /* len of inode buffer */
1370+ int32_t ilf_boffset; /* off of inode in buffer */
1371 } xfs_inode_log_format_t;
1372
1373 typedef struct xfs_inode_log_format_32 {
1374- __uint16_t ilf_type; /* inode log item type */
1375- __uint16_t ilf_size; /* size of this item */
1376- __uint32_t ilf_fields; /* flags for fields logged */
1377- __uint16_t ilf_asize; /* size of attr d/ext/root */
1378- __uint16_t ilf_dsize; /* size of data/ext/root */
1379- __uint64_t ilf_ino; /* inode number */
1380+ uint16_t ilf_type; /* inode log item type */
1381+ uint16_t ilf_size; /* size of this item */
1382+ uint32_t ilf_fields; /* flags for fields logged */
1383+ uint16_t ilf_asize; /* size of attr d/ext/root */
1384+ uint16_t ilf_dsize; /* size of data/ext/root */
1385+ uint64_t ilf_ino; /* inode number */
1386 union {
1387- __uint32_t ilfu_rdev; /* rdev value for dev inode*/
1388+ uint32_t ilfu_rdev; /* rdev value for dev inode*/
1389 uuid_t ilfu_uuid; /* mount point value */
1390 } ilf_u;
1391- __int64_t ilf_blkno; /* blkno of inode buffer */
1392- __int32_t ilf_len; /* len of inode buffer */
1393- __int32_t ilf_boffset; /* off of inode in buffer */
1394+ int64_t ilf_blkno; /* blkno of inode buffer */
1395+ int32_t ilf_len; /* len of inode buffer */
1396+ int32_t ilf_boffset; /* off of inode in buffer */
1397 } __attribute__((packed)) xfs_inode_log_format_32_t;
1398
1399 typedef struct xfs_inode_log_format_64 {
1400- __uint16_t ilf_type; /* inode log item type */
1401- __uint16_t ilf_size; /* size of this item */
1402- __uint32_t ilf_fields; /* flags for fields logged */
1403- __uint16_t ilf_asize; /* size of attr d/ext/root */
1404- __uint16_t ilf_dsize; /* size of data/ext/root */
1405- __uint32_t ilf_pad; /* pad for 64 bit boundary */
1406- __uint64_t ilf_ino; /* inode number */
1407+ uint16_t ilf_type; /* inode log item type */
1408+ uint16_t ilf_size; /* size of this item */
1409+ uint32_t ilf_fields; /* flags for fields logged */
1410+ uint16_t ilf_asize; /* size of attr d/ext/root */
1411+ uint16_t ilf_dsize; /* size of data/ext/root */
1412+ uint32_t ilf_pad; /* pad for 64 bit boundary */
1413+ uint64_t ilf_ino; /* inode number */
1414 union {
1415- __uint32_t ilfu_rdev; /* rdev value for dev inode*/
1416+ uint32_t ilfu_rdev; /* rdev value for dev inode*/
1417 uuid_t ilfu_uuid; /* mount point value */
1418 } ilf_u;
1419- __int64_t ilf_blkno; /* blkno of inode buffer */
1420- __int32_t ilf_len; /* len of inode buffer */
1421- __int32_t ilf_boffset; /* off of inode in buffer */
1422+ int64_t ilf_blkno; /* blkno of inode buffer */
1423+ int32_t ilf_len; /* len of inode buffer */
1424+ int32_t ilf_boffset; /* off of inode in buffer */
1425 } xfs_inode_log_format_64_t;
1426
1427
1428@@ -379,8 +379,8 @@ static inline int xfs_ilog_fdata(int w)
1429 * information.
1430 */
1431 typedef struct xfs_ictimestamp {
1432- __int32_t t_sec; /* timestamp seconds */
1433- __int32_t t_nsec; /* timestamp nanoseconds */
1434+ int32_t t_sec; /* timestamp seconds */
1435+ int32_t t_nsec; /* timestamp nanoseconds */
1436 } xfs_ictimestamp_t;
1437
1438 /*
1439@@ -388,18 +388,18 @@ typedef struct xfs_ictimestamp {
1440 * kept identical to struct xfs_dinode except for the endianness annotations.
1441 */
1442 struct xfs_log_dinode {
1443- __uint16_t di_magic; /* inode magic # = XFS_DINODE_MAGIC */
1444- __uint16_t di_mode; /* mode and type of file */
1445- __int8_t di_version; /* inode version */
1446- __int8_t di_format; /* format of di_c data */
1447- __uint8_t di_pad3[2]; /* unused in v2/3 inodes */
1448- __uint32_t di_uid; /* owner's user id */
1449- __uint32_t di_gid; /* owner's group id */
1450- __uint32_t di_nlink; /* number of links to file */
1451- __uint16_t di_projid_lo; /* lower part of owner's project id */
1452- __uint16_t di_projid_hi; /* higher part of owner's project id */
1453- __uint8_t di_pad[6]; /* unused, zeroed space */
1454- __uint16_t di_flushiter; /* incremented on flush */
1455+ uint16_t di_magic; /* inode magic # = XFS_DINODE_MAGIC */
1456+ uint16_t di_mode; /* mode and type of file */
1457+ int8_t di_version; /* inode version */
1458+ int8_t di_format; /* format of di_c data */
1459+ uint8_t di_pad3[2]; /* unused in v2/3 inodes */
1460+ uint32_t di_uid; /* owner's user id */
1461+ uint32_t di_gid; /* owner's group id */
1462+ uint32_t di_nlink; /* number of links to file */
1463+ uint16_t di_projid_lo; /* lower part of owner's project id */
1464+ uint16_t di_projid_hi; /* higher part of owner's project id */
1465+ uint8_t di_pad[6]; /* unused, zeroed space */
1466+ uint16_t di_flushiter; /* incremented on flush */
1467 xfs_ictimestamp_t di_atime; /* time last accessed */
1468 xfs_ictimestamp_t di_mtime; /* time last modified */
1469 xfs_ictimestamp_t di_ctime; /* time created/inode modified */
1470@@ -408,23 +408,23 @@ struct xfs_log_dinode {
1471 xfs_extlen_t di_extsize; /* basic/minimum extent size for file */
1472 xfs_extnum_t di_nextents; /* number of extents in data fork */
1473 xfs_aextnum_t di_anextents; /* number of extents in attribute fork*/
1474- __uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */
1475- __int8_t di_aformat; /* format of attr fork's data */
1476- __uint32_t di_dmevmask; /* DMIG event mask */
1477- __uint16_t di_dmstate; /* DMIG state info */
1478- __uint16_t di_flags; /* random flags, XFS_DIFLAG_... */
1479- __uint32_t di_gen; /* generation number */
1480+ uint8_t di_forkoff; /* attr fork offs, <<3 for 64b align */
1481+ int8_t di_aformat; /* format of attr fork's data */
1482+ uint32_t di_dmevmask; /* DMIG event mask */
1483+ uint16_t di_dmstate; /* DMIG state info */
1484+ uint16_t di_flags; /* random flags, XFS_DIFLAG_... */
1485+ uint32_t di_gen; /* generation number */
1486
1487 /* di_next_unlinked is the only non-core field in the old dinode */
1488 xfs_agino_t di_next_unlinked;/* agi unlinked list ptr */
1489
1490 /* start of the extended dinode, writable fields */
1491- __uint32_t di_crc; /* CRC of the inode */
1492- __uint64_t di_changecount; /* number of attribute changes */
1493+ uint32_t di_crc; /* CRC of the inode */
1494+ uint64_t di_changecount; /* number of attribute changes */
1495 xfs_lsn_t di_lsn; /* flush sequence */
1496- __uint64_t di_flags2; /* more random flags */
1497- __uint32_t di_cowextsize; /* basic cow extent size for file */
1498- __uint8_t di_pad2[12]; /* more padding for future expansion */
1499+ uint64_t di_flags2; /* more random flags */
1500+ uint32_t di_cowextsize; /* basic cow extent size for file */
1501+ uint8_t di_pad2[12]; /* more padding for future expansion */
1502
1503 /* fields only written to during inode creation */
1504 xfs_ictimestamp_t di_crtime; /* time created */
1505@@ -483,7 +483,7 @@ typedef struct xfs_buf_log_format {
1506 unsigned short blf_size; /* size of this item */
1507 unsigned short blf_flags; /* misc state */
1508 unsigned short blf_len; /* number of blocks in this buf */
1509- __int64_t blf_blkno; /* starting blkno of this buf */
1510+ int64_t blf_blkno; /* starting blkno of this buf */
1511 unsigned int blf_map_size; /* used size of data bitmap in words */
1512 unsigned int blf_data_map[XFS_BLF_DATAMAP_SIZE]; /* dirty bitmap */
1513 } xfs_buf_log_format_t;
1514@@ -533,7 +533,7 @@ xfs_blft_to_flags(struct xfs_buf_log_format *blf, enum xfs_blft type)
1515 blf->blf_flags |= ((type << XFS_BLFT_SHIFT) & XFS_BLFT_MASK);
1516 }
1517
1518-static inline __uint16_t
1519+static inline uint16_t
1520 xfs_blft_from_flags(struct xfs_buf_log_format *blf)
1521 {
1522 return (blf->blf_flags & XFS_BLFT_MASK) >> XFS_BLFT_SHIFT;
1523@@ -554,14 +554,14 @@ typedef struct xfs_extent {
1524 * conversion routine.
1525 */
1526 typedef struct xfs_extent_32 {
1527- __uint64_t ext_start;
1528- __uint32_t ext_len;
1529+ uint64_t ext_start;
1530+ uint32_t ext_len;
1531 } __attribute__((packed)) xfs_extent_32_t;
1532
1533 typedef struct xfs_extent_64 {
1534- __uint64_t ext_start;
1535- __uint32_t ext_len;
1536- __uint32_t ext_pad;
1537+ uint64_t ext_start;
1538+ uint32_t ext_len;
1539+ uint32_t ext_pad;
1540 } xfs_extent_64_t;
1541
1542 /*
1543@@ -570,26 +570,26 @@ typedef struct xfs_extent_64 {
1544 * size is given by efi_nextents.
1545 */
1546 typedef struct xfs_efi_log_format {
1547- __uint16_t efi_type; /* efi log item type */
1548- __uint16_t efi_size; /* size of this item */
1549- __uint32_t efi_nextents; /* # extents to free */
1550- __uint64_t efi_id; /* efi identifier */
1551+ uint16_t efi_type; /* efi log item type */
1552+ uint16_t efi_size; /* size of this item */
1553+ uint32_t efi_nextents; /* # extents to free */
1554+ uint64_t efi_id; /* efi identifier */
1555 xfs_extent_t efi_extents[1]; /* array of extents to free */
1556 } xfs_efi_log_format_t;
1557
1558 typedef struct xfs_efi_log_format_32 {
1559- __uint16_t efi_type; /* efi log item type */
1560- __uint16_t efi_size; /* size of this item */
1561- __uint32_t efi_nextents; /* # extents to free */
1562- __uint64_t efi_id; /* efi identifier */
1563+ uint16_t efi_type; /* efi log item type */
1564+ uint16_t efi_size; /* size of this item */
1565+ uint32_t efi_nextents; /* # extents to free */
1566+ uint64_t efi_id; /* efi identifier */
1567 xfs_extent_32_t efi_extents[1]; /* array of extents to free */
1568 } __attribute__((packed)) xfs_efi_log_format_32_t;
1569
1570 typedef struct xfs_efi_log_format_64 {
1571- __uint16_t efi_type; /* efi log item type */
1572- __uint16_t efi_size; /* size of this item */
1573- __uint32_t efi_nextents; /* # extents to free */
1574- __uint64_t efi_id; /* efi identifier */
1575+ uint16_t efi_type; /* efi log item type */
1576+ uint16_t efi_size; /* size of this item */
1577+ uint32_t efi_nextents; /* # extents to free */
1578+ uint64_t efi_id; /* efi identifier */
1579 xfs_extent_64_t efi_extents[1]; /* array of extents to free */
1580 } xfs_efi_log_format_64_t;
1581
1582@@ -599,26 +599,26 @@ typedef struct xfs_efi_log_format_64 {
1583 * size is given by efd_nextents;
1584 */
1585 typedef struct xfs_efd_log_format {
1586- __uint16_t efd_type; /* efd log item type */
1587- __uint16_t efd_size; /* size of this item */
1588- __uint32_t efd_nextents; /* # of extents freed */
1589- __uint64_t efd_efi_id; /* id of corresponding efi */
1590+ uint16_t efd_type; /* efd log item type */
1591+ uint16_t efd_size; /* size of this item */
1592+ uint32_t efd_nextents; /* # of extents freed */
1593+ uint64_t efd_efi_id; /* id of corresponding efi */
1594 xfs_extent_t efd_extents[1]; /* array of extents freed */
1595 } xfs_efd_log_format_t;
1596
1597 typedef struct xfs_efd_log_format_32 {
1598- __uint16_t efd_type; /* efd log item type */
1599- __uint16_t efd_size; /* size of this item */
1600- __uint32_t efd_nextents; /* # of extents freed */
1601- __uint64_t efd_efi_id; /* id of corresponding efi */
1602+ uint16_t efd_type; /* efd log item type */
1603+ uint16_t efd_size; /* size of this item */
1604+ uint32_t efd_nextents; /* # of extents freed */
1605+ uint64_t efd_efi_id; /* id of corresponding efi */
1606 xfs_extent_32_t efd_extents[1]; /* array of extents freed */
1607 } __attribute__((packed)) xfs_efd_log_format_32_t;
1608
1609 typedef struct xfs_efd_log_format_64 {
1610- __uint16_t efd_type; /* efd log item type */
1611- __uint16_t efd_size; /* size of this item */
1612- __uint32_t efd_nextents; /* # of extents freed */
1613- __uint64_t efd_efi_id; /* id of corresponding efi */
1614+ uint16_t efd_type; /* efd log item type */
1615+ uint16_t efd_size; /* size of this item */
1616+ uint32_t efd_nextents; /* # of extents freed */
1617+ uint64_t efd_efi_id; /* id of corresponding efi */
1618 xfs_extent_64_t efd_extents[1]; /* array of extents freed */
1619 } xfs_efd_log_format_64_t;
1620
1621@@ -626,11 +626,11 @@ typedef struct xfs_efd_log_format_64 {
1622 * RUI/RUD (reverse mapping) log format definitions
1623 */
1624 struct xfs_map_extent {
1625- __uint64_t me_owner;
1626- __uint64_t me_startblock;
1627- __uint64_t me_startoff;
1628- __uint32_t me_len;
1629- __uint32_t me_flags;
1630+ uint64_t me_owner;
1631+ uint64_t me_startblock;
1632+ uint64_t me_startoff;
1633+ uint32_t me_len;
1634+ uint32_t me_flags;
1635 };
1636
1637 /* rmap me_flags: upper bits are flags, lower byte is type code */
1638@@ -659,10 +659,10 @@ struct xfs_map_extent {
1639 * size is given by rui_nextents.
1640 */
1641 struct xfs_rui_log_format {
1642- __uint16_t rui_type; /* rui log item type */
1643- __uint16_t rui_size; /* size of this item */
1644- __uint32_t rui_nextents; /* # extents to free */
1645- __uint64_t rui_id; /* rui identifier */
1646+ uint16_t rui_type; /* rui log item type */
1647+ uint16_t rui_size; /* size of this item */
1648+ uint32_t rui_nextents; /* # extents to free */
1649+ uint64_t rui_id; /* rui identifier */
1650 struct xfs_map_extent rui_extents[]; /* array of extents to rmap */
1651 };
1652
1653@@ -680,19 +680,19 @@ xfs_rui_log_format_sizeof(
1654 * size is given by rud_nextents;
1655 */
1656 struct xfs_rud_log_format {
1657- __uint16_t rud_type; /* rud log item type */
1658- __uint16_t rud_size; /* size of this item */
1659- __uint32_t __pad;
1660- __uint64_t rud_rui_id; /* id of corresponding rui */
1661+ uint16_t rud_type; /* rud log item type */
1662+ uint16_t rud_size; /* size of this item */
1663+ uint32_t __pad;
1664+ uint64_t rud_rui_id; /* id of corresponding rui */
1665 };
1666
1667 /*
1668 * CUI/CUD (refcount update) log format definitions
1669 */
1670 struct xfs_phys_extent {
1671- __uint64_t pe_startblock;
1672- __uint32_t pe_len;
1673- __uint32_t pe_flags;
1674+ uint64_t pe_startblock;
1675+ uint32_t pe_len;
1676+ uint32_t pe_flags;
1677 };
1678
1679 /* refcount pe_flags: upper bits are flags, lower byte is type code */
1680@@ -707,10 +707,10 @@ struct xfs_phys_extent {
1681 * size is given by cui_nextents.
1682 */
1683 struct xfs_cui_log_format {
1684- __uint16_t cui_type; /* cui log item type */
1685- __uint16_t cui_size; /* size of this item */
1686- __uint32_t cui_nextents; /* # extents to free */
1687- __uint64_t cui_id; /* cui identifier */
1688+ uint16_t cui_type; /* cui log item type */
1689+ uint16_t cui_size; /* size of this item */
1690+ uint32_t cui_nextents; /* # extents to free */
1691+ uint64_t cui_id; /* cui identifier */
1692 struct xfs_phys_extent cui_extents[]; /* array of extents */
1693 };
1694
1695@@ -728,10 +728,10 @@ xfs_cui_log_format_sizeof(
1696 * size is given by cud_nextents;
1697 */
1698 struct xfs_cud_log_format {
1699- __uint16_t cud_type; /* cud log item type */
1700- __uint16_t cud_size; /* size of this item */
1701- __uint32_t __pad;
1702- __uint64_t cud_cui_id; /* id of corresponding cui */
1703+ uint16_t cud_type; /* cud log item type */
1704+ uint16_t cud_size; /* size of this item */
1705+ uint32_t __pad;
1706+ uint64_t cud_cui_id; /* id of corresponding cui */
1707 };
1708
1709 /*
1710@@ -755,10 +755,10 @@ struct xfs_cud_log_format {
1711 * size is given by bui_nextents.
1712 */
1713 struct xfs_bui_log_format {
1714- __uint16_t bui_type; /* bui log item type */
1715- __uint16_t bui_size; /* size of this item */
1716- __uint32_t bui_nextents; /* # extents to free */
1717- __uint64_t bui_id; /* bui identifier */
1718+ uint16_t bui_type; /* bui log item type */
1719+ uint16_t bui_size; /* size of this item */
1720+ uint32_t bui_nextents; /* # extents to free */
1721+ uint64_t bui_id; /* bui identifier */
1722 struct xfs_map_extent bui_extents[]; /* array of extents to bmap */
1723 };
1724
1725@@ -776,10 +776,10 @@ xfs_bui_log_format_sizeof(
1726 * size is given by bud_nextents;
1727 */
1728 struct xfs_bud_log_format {
1729- __uint16_t bud_type; /* bud log item type */
1730- __uint16_t bud_size; /* size of this item */
1731- __uint32_t __pad;
1732- __uint64_t bud_bui_id; /* id of corresponding bui */
1733+ uint16_t bud_type; /* bud log item type */
1734+ uint16_t bud_size; /* size of this item */
1735+ uint32_t __pad;
1736+ uint64_t bud_bui_id; /* id of corresponding bui */
1737 };
1738
1739 /*
1740@@ -789,12 +789,12 @@ struct xfs_bud_log_format {
1741 * 32 bits : log_recovery code assumes that.
1742 */
1743 typedef struct xfs_dq_logformat {
1744- __uint16_t qlf_type; /* dquot log item type */
1745- __uint16_t qlf_size; /* size of this item */
1746+ uint16_t qlf_type; /* dquot log item type */
1747+ uint16_t qlf_size; /* size of this item */
1748 xfs_dqid_t qlf_id; /* usr/grp/proj id : 32 bits */
1749- __int64_t qlf_blkno; /* blkno of dquot buffer */
1750- __int32_t qlf_len; /* len of dquot buffer */
1751- __uint32_t qlf_boffset; /* off of dquot in buffer */
1752+ int64_t qlf_blkno; /* blkno of dquot buffer */
1753+ int32_t qlf_len; /* len of dquot buffer */
1754+ uint32_t qlf_boffset; /* off of dquot in buffer */
1755 } xfs_dq_logformat_t;
1756
1757 /*
1758@@ -853,8 +853,8 @@ typedef struct xfs_qoff_logformat {
1759 * decoding can be done correctly.
1760 */
1761 struct xfs_icreate_log {
1762- __uint16_t icl_type; /* type of log format structure */
1763- __uint16_t icl_size; /* size of log format structure */
1764+ uint16_t icl_type; /* type of log format structure */
1765+ uint16_t icl_size; /* size of log format structure */
1766 __be32 icl_ag; /* ag being allocated in */
1767 __be32 icl_agbno; /* start block of inode range */
1768 __be32 icl_count; /* number of inodes to initialise */
1769diff --git a/libxfs/xfs_quota_defs.h b/libxfs/xfs_quota_defs.h
1770index 8eed5127..d69c7722 100644
1771--- a/libxfs/xfs_quota_defs.h
1772+++ b/libxfs/xfs_quota_defs.h
1773@@ -27,8 +27,8 @@
1774 * they may need 64-bit accounting. Hence, 64-bit quota-counters,
1775 * and quota-limits. This is a waste in the common case, but hey ...
1776 */
1777-typedef __uint64_t xfs_qcnt_t;
1778-typedef __uint16_t xfs_qwarncnt_t;
1779+typedef uint64_t xfs_qcnt_t;
1780+typedef uint16_t xfs_qwarncnt_t;
1781
1782 /*
1783 * flags for q_flags field in the dquot.
1784diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
1785index 2814f94f..bd1a8f2d 100644
1786--- a/libxfs/xfs_refcount_btree.c
1787+++ b/libxfs/xfs_refcount_btree.c
1788@@ -201,7 +201,7 @@ xfs_refcountbt_init_ptr_from_cur(
1789 ptr->s = agf->agf_refcount_root;
1790 }
1791
1792-STATIC __int64_t
1793+STATIC int64_t
1794 xfs_refcountbt_key_diff(
1795 struct xfs_btree_cur *cur,
1796 union xfs_btree_key *key)
1797@@ -209,16 +209,16 @@ xfs_refcountbt_key_diff(
1798 struct xfs_refcount_irec *rec = &cur->bc_rec.rc;
1799 struct xfs_refcount_key *kp = &key->refc;
1800
1801- return (__int64_t)be32_to_cpu(kp->rc_startblock) - rec->rc_startblock;
1802+ return (int64_t)be32_to_cpu(kp->rc_startblock) - rec->rc_startblock;
1803 }
1804
1805-STATIC __int64_t
1806+STATIC int64_t
1807 xfs_refcountbt_diff_two_keys(
1808 struct xfs_btree_cur *cur,
1809 union xfs_btree_key *k1,
1810 union xfs_btree_key *k2)
1811 {
1812- return (__int64_t)be32_to_cpu(k1->refc.rc_startblock) -
1813+ return (int64_t)be32_to_cpu(k1->refc.rc_startblock) -
1814 be32_to_cpu(k2->refc.rc_startblock);
1815 }
1816
1817diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
1818index f78771d1..0d6b5d41 100644
1819--- a/libxfs/xfs_rmap.c
1820+++ b/libxfs/xfs_rmap.c
1821@@ -2059,7 +2059,7 @@ int
1822 xfs_rmap_finish_one(
1823 struct xfs_trans *tp,
1824 enum xfs_rmap_intent_type type,
1825- __uint64_t owner,
1826+ uint64_t owner,
1827 int whichfork,
1828 xfs_fileoff_t startoff,
1829 xfs_fsblock_t startblock,
1830@@ -2180,7 +2180,7 @@ __xfs_rmap_add(
1831 struct xfs_mount *mp,
1832 struct xfs_defer_ops *dfops,
1833 enum xfs_rmap_intent_type type,
1834- __uint64_t owner,
1835+ uint64_t owner,
1836 int whichfork,
1837 struct xfs_bmbt_irec *bmap)
1838 {
1839@@ -2264,7 +2264,7 @@ xfs_rmap_alloc_extent(
1840 xfs_agnumber_t agno,
1841 xfs_agblock_t bno,
1842 xfs_extlen_t len,
1843- __uint64_t owner)
1844+ uint64_t owner)
1845 {
1846 struct xfs_bmbt_irec bmap;
1847
1848@@ -2288,7 +2288,7 @@ xfs_rmap_free_extent(
1849 xfs_agnumber_t agno,
1850 xfs_agblock_t bno,
1851 xfs_extlen_t len,
1852- __uint64_t owner)
1853+ uint64_t owner)
1854 {
1855 struct xfs_bmbt_irec bmap;
1856
1857diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h
1858index 98f908fe..265116d0 100644
1859--- a/libxfs/xfs_rmap.h
1860+++ b/libxfs/xfs_rmap.h
1861@@ -179,7 +179,7 @@ enum xfs_rmap_intent_type {
1862 struct xfs_rmap_intent {
1863 struct list_head ri_list;
1864 enum xfs_rmap_intent_type ri_type;
1865- __uint64_t ri_owner;
1866+ uint64_t ri_owner;
1867 int ri_whichfork;
1868 struct xfs_bmbt_irec ri_bmap;
1869 };
1870@@ -196,15 +196,15 @@ int xfs_rmap_convert_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops,
1871 struct xfs_bmbt_irec *imap);
1872 int xfs_rmap_alloc_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops,
1873 xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len,
1874- __uint64_t owner);
1875+ uint64_t owner);
1876 int xfs_rmap_free_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops,
1877 xfs_agnumber_t agno, xfs_agblock_t bno, xfs_extlen_t len,
1878- __uint64_t owner);
1879+ uint64_t owner);
1880
1881 void xfs_rmap_finish_one_cleanup(struct xfs_trans *tp,
1882 struct xfs_btree_cur *rcur, int error);
1883 int xfs_rmap_finish_one(struct xfs_trans *tp, enum xfs_rmap_intent_type type,
1884- __uint64_t owner, int whichfork, xfs_fileoff_t startoff,
1885+ uint64_t owner, int whichfork, xfs_fileoff_t startoff,
1886 xfs_fsblock_t startblock, xfs_filblks_t blockcount,
1887 xfs_exntst_t state, struct xfs_btree_cur **pcur);
1888
1889diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
1890index a186c872..45ac436f 100644
1891--- a/libxfs/xfs_rmap_btree.c
1892+++ b/libxfs/xfs_rmap_btree.c
1893@@ -197,7 +197,7 @@ xfs_rmapbt_init_high_key_from_rec(
1894 union xfs_btree_key *key,
1895 union xfs_btree_rec *rec)
1896 {
1897- __uint64_t off;
1898+ uint64_t off;
1899 int adj;
1900
1901 adj = be32_to_cpu(rec->rmap.rm_blockcount) - 1;
1902@@ -239,7 +239,7 @@ xfs_rmapbt_init_ptr_from_cur(
1903 ptr->s = agf->agf_roots[cur->bc_btnum];
1904 }
1905
1906-STATIC __int64_t
1907+STATIC int64_t
1908 xfs_rmapbt_key_diff(
1909 struct xfs_btree_cur *cur,
1910 union xfs_btree_key *key)
1911@@ -247,9 +247,9 @@ xfs_rmapbt_key_diff(
1912 struct xfs_rmap_irec *rec = &cur->bc_rec.r;
1913 struct xfs_rmap_key *kp = &key->rmap;
1914 __u64 x, y;
1915- __int64_t d;
1916+ int64_t d;
1917
1918- d = (__int64_t)be32_to_cpu(kp->rm_startblock) - rec->rm_startblock;
1919+ d = (int64_t)be32_to_cpu(kp->rm_startblock) - rec->rm_startblock;
1920 if (d)
1921 return d;
1922
1923@@ -269,7 +269,7 @@ xfs_rmapbt_key_diff(
1924 return 0;
1925 }
1926
1927-STATIC __int64_t
1928+STATIC int64_t
1929 xfs_rmapbt_diff_two_keys(
1930 struct xfs_btree_cur *cur,
1931 union xfs_btree_key *k1,
1932@@ -277,10 +277,10 @@ xfs_rmapbt_diff_two_keys(
1933 {
1934 struct xfs_rmap_key *kp1 = &k1->rmap;
1935 struct xfs_rmap_key *kp2 = &k2->rmap;
1936- __int64_t d;
1937+ int64_t d;
1938 __u64 x, y;
1939
1940- d = (__int64_t)be32_to_cpu(kp1->rm_startblock) -
1941+ d = (int64_t)be32_to_cpu(kp1->rm_startblock) -
1942 be32_to_cpu(kp2->rm_startblock);
1943 if (d)
1944 return d;
1945@@ -382,10 +382,10 @@ xfs_rmapbt_keys_inorder(
1946 union xfs_btree_key *k1,
1947 union xfs_btree_key *k2)
1948 {
1949- __uint32_t x;
1950- __uint32_t y;
1951- __uint64_t a;
1952- __uint64_t b;
1953+ uint32_t x;
1954+ uint32_t y;
1955+ uint64_t a;
1956+ uint64_t b;
1957
1958 x = be32_to_cpu(k1->rmap.rm_startblock);
1959 y = be32_to_cpu(k2->rmap.rm_startblock);
1960@@ -412,10 +412,10 @@ xfs_rmapbt_recs_inorder(
1961 union xfs_btree_rec *r1,
1962 union xfs_btree_rec *r2)
1963 {
1964- __uint32_t x;
1965- __uint32_t y;
1966- __uint64_t a;
1967- __uint64_t b;
1968+ uint32_t x;
1969+ uint32_t y;
1970+ uint64_t a;
1971+ uint64_t b;
1972
1973 x = be32_to_cpu(r1->rmap.rm_startblock);
1974 y = be32_to_cpu(r2->rmap.rm_startblock);
1975diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
1976index dbd2f881..8f8a99d6 100644
1977--- a/libxfs/xfs_rtbitmap.c
1978+++ b/libxfs/xfs_rtbitmap.c
1979@@ -1006,7 +1006,7 @@ xfs_rtfree_extent(
1980 mp->m_sb.sb_rextents) {
1981 if (!(mp->m_rbmip->i_d.di_flags & XFS_DIFLAG_NEWRTBM))
1982 mp->m_rbmip->i_d.di_flags |= XFS_DIFLAG_NEWRTBM;
1983- *(__uint64_t *)&VFS_I(mp->m_rbmip)->i_atime = 0;
1984+ *(uint64_t *)&VFS_I(mp->m_rbmip)->i_atime = 0;
1985 xfs_trans_log_inode(tp, mp->m_rbmip, XFS_ILOG_CORE);
1986 }
1987 return 0;
1988diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
1989index 93a18190..51f69704 100644
1990--- a/libxfs/xfs_sb.c
1991+++ b/libxfs/xfs_sb.c
1992@@ -430,7 +430,7 @@ xfs_sb_quota_to_disk(
1993 struct xfs_dsb *to,
1994 struct xfs_sb *from)
1995 {
1996- __uint16_t qflags = from->sb_qflags;
1997+ uint16_t qflags = from->sb_qflags;
1998
1999 to->sb_uquotino = cpu_to_be64(from->sb_uquotino);
2000 if (xfs_sb_version_has_pquotino(from)) {
2001@@ -738,7 +738,7 @@ xfs_sb_mount_common(
2002 mp->m_refc_mnr[1] = mp->m_refc_mxr[1] / 2;
2003
2004 mp->m_bsize = XFS_FSB_TO_BB(mp, 1);
2005- mp->m_ialloc_inos = (int)MAX((__uint16_t)XFS_INODES_PER_CHUNK,
2006+ mp->m_ialloc_inos = (int)MAX((uint16_t)XFS_INODES_PER_CHUNK,
2007 sbp->sb_inopblock);
2008 mp->m_ialloc_blks = mp->m_ialloc_inos >> sbp->sb_inopblog;
2009
2010diff --git a/libxfs/xfs_types.h b/libxfs/xfs_types.h
2011index 717909f2..0220159b 100644
2012--- a/libxfs/xfs_types.h
2013+++ b/libxfs/xfs_types.h
2014@@ -18,34 +18,34 @@
2015 #ifndef __XFS_TYPES_H__
2016 #define __XFS_TYPES_H__
2017
2018-typedef __uint32_t prid_t; /* project ID */
2019+typedef uint32_t prid_t; /* project ID */
2020
2021-typedef __uint32_t xfs_agblock_t; /* blockno in alloc. group */
2022-typedef __uint32_t xfs_agino_t; /* inode # within allocation grp */
2023-typedef __uint32_t xfs_extlen_t; /* extent length in blocks */
2024-typedef __uint32_t xfs_agnumber_t; /* allocation group number */
2025-typedef __int32_t xfs_extnum_t; /* # of extents in a file */
2026-typedef __int16_t xfs_aextnum_t; /* # extents in an attribute fork */
2027-typedef __int64_t xfs_fsize_t; /* bytes in a file */
2028-typedef __uint64_t xfs_ufsize_t; /* unsigned bytes in a file */
2029+typedef uint32_t xfs_agblock_t; /* blockno in alloc. group */
2030+typedef uint32_t xfs_agino_t; /* inode # within allocation grp */
2031+typedef uint32_t xfs_extlen_t; /* extent length in blocks */
2032+typedef uint32_t xfs_agnumber_t; /* allocation group number */
2033+typedef int32_t xfs_extnum_t; /* # of extents in a file */
2034+typedef int16_t xfs_aextnum_t; /* # extents in an attribute fork */
2035+typedef int64_t xfs_fsize_t; /* bytes in a file */
2036+typedef uint64_t xfs_ufsize_t; /* unsigned bytes in a file */
2037
2038-typedef __int32_t xfs_suminfo_t; /* type of bitmap summary info */
2039-typedef __int32_t xfs_rtword_t; /* word type for bitmap manipulations */
2040+typedef int32_t xfs_suminfo_t; /* type of bitmap summary info */
2041+typedef int32_t xfs_rtword_t; /* word type for bitmap manipulations */
2042
2043-typedef __int64_t xfs_lsn_t; /* log sequence number */
2044-typedef __int32_t xfs_tid_t; /* transaction identifier */
2045+typedef int64_t xfs_lsn_t; /* log sequence number */
2046+typedef int32_t xfs_tid_t; /* transaction identifier */
2047
2048-typedef __uint32_t xfs_dablk_t; /* dir/attr block number (in file) */
2049-typedef __uint32_t xfs_dahash_t; /* dir/attr hash value */
2050+typedef uint32_t xfs_dablk_t; /* dir/attr block number (in file) */
2051+typedef uint32_t xfs_dahash_t; /* dir/attr hash value */
2052
2053-typedef __uint64_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */
2054-typedef __uint64_t xfs_rfsblock_t; /* blockno in filesystem (raw) */
2055-typedef __uint64_t xfs_rtblock_t; /* extent (block) in realtime area */
2056-typedef __uint64_t xfs_fileoff_t; /* block number in a file */
2057-typedef __uint64_t xfs_filblks_t; /* number of blocks in a file */
2058+typedef uint64_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */
2059+typedef uint64_t xfs_rfsblock_t; /* blockno in filesystem (raw) */
2060+typedef uint64_t xfs_rtblock_t; /* extent (block) in realtime area */
2061+typedef uint64_t xfs_fileoff_t; /* block number in a file */
2062+typedef uint64_t xfs_filblks_t; /* number of blocks in a file */
2063
2064-typedef __int64_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */
2065-typedef __int64_t xfs_sfiloff_t; /* signed block number in a file */
2066+typedef int64_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */
2067+typedef int64_t xfs_sfiloff_t; /* signed block number in a file */
2068
2069 /*
2070 * Null values for the types.
2071@@ -125,7 +125,7 @@ struct xfs_name {
2072 * uid_t and gid_t are hard-coded to 32 bits in the inode.
2073 * Hence, an 'id' in a dquot is 32 bits..
2074 */
2075-typedef __uint32_t xfs_dqid_t;
2076+typedef uint32_t xfs_dqid_t;
2077
2078 /*
2079 * Constants for bit manipulations.
2080--
20812.14.1
2082
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-23 14:57:56 +0000