Move to more stdint types
PATCH 4/4 Move to more stdint types
The uint*_t and int*_t are defined by C99 and should be prefered over the less portable __uint*_t and __int*_t variants. The necessary <stdint.h> include is in platformdefs.h, which gets included in most places via libxfs.h.
For now, only replace all __uint*_t types to uint*_t and likewise for __int*_t outside the directories include/ and libxfs/.
Signed-off-by Felix Janda <[email protected]>
--- copy/xfs_copy.c | 14 ++++---- copy/xfs_copy.h | 2 +- db/attr.c | 8 ++--- db/attrshort.c | 4 +-- db/bit.c | 4 +-- db/bit.h | 2 +- db/block.c | 8 ++--- db/check.c | 18 +++++----- db/convert.c | 28 ++++++++-------- db/faddr.c | 14 ++++---- db/field.c | 44 ++++++++++++------------- db/fprint.c | 8 ++--- db/frag.c | 8 ++--- db/inode.c | 30 ++++++++--------- db/io.c | 4 +-- db/io.h | 8 ++--- db/metadump.c | 12 +++---- db/sb.c | 6 ++-- fsr/xfs_fsr.c | 2 +- libhandle/handle.c | 2 +- libhandle/jdm.c | 2 +- logprint/log_misc.c | 6 ++-- mdrestore/xfs_mdrestore.c | 2 +- mkfs/proto.c | 2 +- mkfs/xfs_mkfs.c | 84 +++++++++++++++++++++++------------------------ quota/edit.c | 64 ++++++++++++++++++------------------ quota/free.c | 44 ++++++++++++------------- quota/quot.c | 24 +++++++------- quota/quota.c | 4 +-- quota/quota.h | 12 +++---- quota/report.c | 4 +-- quota/state.c | 2 +- quota/util.c | 66 ++++++++++++++++++------------------- repair/README | 2 +- repair/agheader.h | 14 ++++---- repair/attr_repair.h | 26 +++++++-------- repair/avl64.c | 38 ++++++++++----------- repair/avl64.h | 18 +++++----- repair/dino_chunks.c | 2 +- repair/dinode.c | 38 ++++++++++----------- repair/dinode.h | 4 +-- repair/dir2.c | 2 +- repair/globals.h | 16 ++++----- repair/incore.c | 10 +++--- repair/incore.h | 42 ++++++++++++------------ repair/incore_ext.c | 6 ++-- repair/incore_ino.c | 72 ++++++++++++++++++++-------------------- repair/phase2.c | 2 +- repair/phase3.c | 6 ++-- repair/phase4.c | 4 +-- repair/phase5.c | 40 +++++++++++----------- repair/phase6.c | 16 ++++----- repair/phase7.c | 6 ++-- repair/progress.c | 30 ++++++++--------- repair/progress.h | 4 +-- repair/sb.c | 10 +++--- repair/scan.c | 42 ++++++++++++------------ repair/scan.h | 12 +++---- 58 files changed, 502 insertions(+), 502 deletions(-)
copy/xfs_copy.c +7 -7
@@ -43,7 +43,7 @@ unsigned int source_sectorsize; /* source disk sectorsize */xfs_agblock_t first_agbno; -__uint64_t barcount[11 ]; +uint64_t barcount[11 ];unsigned int num_targets;target_control *target;
@@ -313,7 +313,7 @@ usage(void) }void -init_bar (__uint64_t source_blocks) +init_bar (uint64_t source_blocks) {int i;
@@ -322,7 +322,7 @@ init_bar(__uint64_t source_blocks) }int -bump_bar (int tenths,__uint64_t numblocks) +bump_bar (int tenths,uint64_t numblocks) {static char *bar[11 ] = {" 0% " ,
@@ -532,8 +532,8 @@ main(int argc, char **argv)xfs_off_t pos;size_t length;int c; -__uint64_t size, sizeb; -__uint64_t numblocks =0 ; +uint64_t size, sizeb; +uint64_t numblocks =0 ;int wblocks =0 ;int num_threads =0 ;struct dioattr d;
@@ -949,8 +949,8 @@ main(int argc, char **argv) num_ags = mp->m_sb.sb_agcount;init_bar (mp->m_sb.sb_blocksize /BBSIZE - * ((__uint64_t )mp->m_sb.sb_dblocks - - (__uint64_t )mp->m_sb.sb_fdblocks +10 * num_ags)); + * ((uint64_t )mp->m_sb.sb_dblocks + - (uint64_t )mp->m_sb.sb_fdblocks +10 * num_ags)); kids = num_targets;
copy/xfs_copy.h +1 -1
@@ -76,7 +76,7 @@ typedef struct {typedef int thread_id ;typedef int tm_index ;/* index into thread mask array */ -typedef __uint32_t thread_mask ;/* a thread mask */ +typedef uint32_t thread_mask ;/* a thread mask */ typedef struct { char *name;
db/attr.c +4 -4
@@ -77,16 +77,16 @@ const field_t attr_leaf_entry_flds[] = { { "nameidx", FLDT_UINT16D, OI(LEOFF(nameidx)), C1, 0, TYP_NONE }, { "flags", FLDT_UINT8X, OI(LEOFF(flags)), C1, FLD_SKIPALL, TYP_NONE }, { "incomplete", FLDT_UINT1, -OI (LEOFF (flags) +bitsz (__uint8_t) -XFS_ATTR_INCOMPLETE_BIT -1 ),C1 , +OI (LEOFF (flags) +bitsz (uint8_t) -XFS_ATTR_INCOMPLETE_BIT -1 ),C1 , 0, TYP_NONE }, { "root", FLDT_UINT1, -OI (LEOFF (flags) +bitsz (__uint8_t) -XFS_ATTR_ROOT_BIT -1 ),C1 ,0 , +OI (LEOFF (flags) +bitsz (uint8_t) -XFS_ATTR_ROOT_BIT -1 ),C1 ,0 , TYP_NONE }, { "secure", FLDT_UINT1, -OI (LEOFF (flags) +bitsz (__uint8_t) -XFS_ATTR_SECURE_BIT -1 ),C1 ,0 , +OI (LEOFF (flags) +bitsz (uint8_t) -XFS_ATTR_SECURE_BIT -1 ),C1 ,0 , TYP_NONE }, { "local", FLDT_UINT1, -OI (LEOFF (flags) +bitsz (__uint8_t) -XFS_ATTR_LOCAL_BIT -1 ),C1 ,0 , +OI (LEOFF (flags) +bitsz (uint8_t) -XFS_ATTR_LOCAL_BIT -1 ),C1 ,0 , TYP_NONE }, { "pad2", FLDT_UINT8X, OI(LEOFF(pad2)), C1, FLD_SKIPALL, TYP_NONE }, { NULL }
db/attrshort.c +2 -2
@@ -51,10 +51,10 @@ const field_t attr_sf_entry_flds[] = { { "valuelen", FLDT_UINT8D, OI(EOFF(valuelen)), C1, 0, TYP_NONE }, { "flags", FLDT_UINT8X, OI(EOFF(flags)), C1, FLD_SKIPALL, TYP_NONE }, { "root", FLDT_UINT1, -OI (EOFF (flags) +bitsz (__uint8_t) -XFS_ATTR_ROOT_BIT -1 ),C1 ,0 , +OI (EOFF (flags) +bitsz (uint8_t) -XFS_ATTR_ROOT_BIT -1 ),C1 ,0 , TYP_NONE }, { "secure", FLDT_UINT1, -OI (EOFF (flags) +bitsz (__uint8_t) -XFS_ATTR_SECURE_BIT -1 ),C1 ,0 , +OI (EOFF (flags) +bitsz (uint8_t) -XFS_ATTR_SECURE_BIT -1 ),C1 ,0 , TYP_NONE }, { "name", FLDT_CHARNS, OI(EOFF(nameval)), attr_sf_entry_name_count, FLD_COUNT, TYP_NONE },
db/bit.c +2 -2
@@ -60,7 +60,7 @@ setbit( } } -__int64_t +int64_t getbitval( void *obj, int bitoff,
@@ -70,7 +70,7 @@ getbitval(int bit;int i;char *p; -__int64_t rval; +int64_t rval;int signext;int z1, z2, z3, z4;
db/bit.h +1 -1
@@ -25,5 +25,5 @@#define BVUNSIGNED 0#define BVSIGNED 1 -extern __int64_t getbitval (void *obj,int bitoff,int nbits,int flags); +extern int64_t getbitval (void *obj,int bitoff,int nbits,int flags);extern void setbitval (void *obuf,int bitoff,int nbits,void *ibuf);
db/block.c +4 -4
@@ -98,7 +98,7 @@ ablock_f( } dfsbno = bm.startblock + (bno - bm.startoff);ASSERT (typtab[TYP_ATTR ].typnm ==TYP_ATTR ); -set_cur (&typtab[TYP_ATTR ], (__int64_t )XFS_FSB_TO_DADDR (mp, dfsbno), +set_cur (&typtab[TYP_ATTR ], (int64_t )XFS_FSB_TO_DADDR (mp, dfsbno), blkbb,DB_RING_ADD ,NULL );return 0 ; }
@@ -128,14 +128,14 @@ daddr_f(int argc, char **argv) { - __int64_t d; + int64_t d;char *p;if (argc ==1 ) {dbprintf (_ ("current daddr is %lld\n" ), iocur_top->off >>BBSHIFT );return 0 ; } - d = (__int64_t )strtoull (argv[1 ], &p,0 ); + d = (int64_t )strtoull (argv[1 ], &p,0 );if (*p !='\0' || d >= mp->m_sb.sb_dblocks << (mp->m_sb.sb_blocklog -BBSHIFT )) {dbprintf (_ ("bad daddr %s\n" ), argv[1 ]);
@@ -197,7 +197,7 @@ dblock_f(ASSERT (typtab[type].typnm == type);if (nex >1 )make_bbmap (&bbmap, nex, bmp); -set_cur (&typtab[type], (__int64_t )XFS_FSB_TO_DADDR (mp, dfsbno), +set_cur (&typtab[type], (int64_t )XFS_FSB_TO_DADDR (mp, dfsbno), nb * blkbb,DB_RING_ADD , nex >1 ? &bbmap :NULL );free (bmp);return 0 ;
db/check.c +9 -9
@@ -112,8 +112,8 @@ typedef struct dirhash {static xfs_extlen_t agffreeblks;static xfs_extlen_t agflongest; -static __uint64_t agf_aggr_freeblks;/* aggregate count over all */ -static __uint32_t agfbtreeblks; +static uint64_t agf_aggr_freeblks;/* aggregate count over all */ +static uint32_t agfbtreeblks;static int lazycount;static xfs_agino_t agicount;static xfs_agino_t agifreecount;
@@ -122,10 +122,10 @@ static int blist_size;static char **dbmap;/* really dbm_t:8 */ static dirhash_t **dirhash;static int error; -static __uint64_t fdblocks; -static __uint64_t frextents; -static __uint64_t icount; -static __uint64_t ifree; +static uint64_t fdblocks; +static uint64_t frextents; +static uint64_t icount; +static uint64_t ifree;static inodata_t ***inodata;static int inodata_hash_size;static inodata_t ***inomap;
@@ -1173,7 +1173,7 @@ blocktrash_f( goto out; }for (i =0 ; i < count; i++) { - randb = (xfs_rfsblock_t)((((__int64_t )random () <<32 ) | + randb = (xfs_rfsblock_t)((((int64_t )random () <<32 ) |random ()) % blocks); for (bi = 0, agno = 0, done = 0; !done && agno < mp->m_sb.sb_agcount;
@@ -2985,7 +2985,7 @@ process_leaf_node_dir_v2( }if (v)dbprintf (_ ("dir inode %lld block %u=%llu\n" ), id->ino, - (__uint32_t )dbno, + (uint32_t )dbno, (xfs_fsblock_t )bmp->startblock);push_cur ();if (nex >1 )
@@ -2998,7 +2998,7 @@ process_leaf_node_dir_v2(if (!sflag || v)dbprintf (_ ("can't read block %u for directory " "inode %lld\n" ), - (__uint32_t )dbno, id->ino); + (uint32_t )dbno, id->ino); error++;pop_cur (); dbno += mp->m_dir_geo->fsbcount -1 ;
db/convert.c +14 -14
@@ -24,13 +24,13 @@#define M (A ) (1 << CT_ ## A)#define agblock_to_bytes (x) \ - ((__uint64_t)(x) << mp->m_sb.sb_blocklog) + ((uint64_t)(x) << mp->m_sb.sb_blocklog)#define agino_to_bytes (x) \ - ((__uint64_t)(x) << mp->m_sb.sb_inodelog) + ((uint64_t)(x) << mp->m_sb.sb_inodelog)#define agnumber_to_bytes (x) \ - agblock_to_bytes((__uint64_t)(x) * mp->m_sb.sb_agblocks) + agblock_to_bytes((uint64_t)(x) * mp->m_sb.sb_agblocks)#define daddr_to_bytes (x) \ - ((__uint64_t)(x) << BBSHIFT) + ((uint64_t)(x) << BBSHIFT)#define fsblock_to_bytes (x) \ (agnumber_to_bytes(XFS_FSB_TO_AGNO(mp, (x))) + \ agblock_to_bytes(XFS_FSB_TO_AGBNO(mp, (x))))
@@ -38,7 +38,7 @@ (agnumber_to_bytes (XFS_INO_TO_AGNO (mp, (x))) + \ agino_to_bytes(XFS_INO_TO_AGINO(mp, (x))))#define inoidx_to_bytes (x) \ - ((__uint64_t)(x) << mp->m_sb.sb_inodelog) + ((uint64_t)(x) << mp->m_sb.sb_inodelog) typedef enum { CT_NONE = -1,
@@ -68,7 +68,7 @@ typedef union {xfs_agnumber_t agnumber;int bboff;int blkoff; -__uint64_t byte; +uint64_t byte;xfs_daddr_t daddr;xfs_fsblock_t fsblock;xfs_ino_t ino;
@@ -76,7 +76,7 @@ typedef union {int inooff; } cval_t; -static __uint64_t bytevalue (ctype_t ctype,cval_t *val); +static uint64_t bytevalue (ctype_t ctype,cval_t *val);static int convert_f (int argc,char **argv);static int getvalue (char *s,ctype_t ctype,cval_t *val);static ctype_t lookupcty (char *ctyname);
@@ -118,7 +118,7 @@ static const cmdinfo_t convert_cmd = {"convert" ,NULL , convert_f,3 ,9 ,0 ,"type num [type num]... type" , "convert from one address form to another", NULL }; -static __uint64_t +static uint64_t bytevalue (ctype_t ctype,cval_t *val) {switch (ctype) {
@@ -129,9 +129,9 @@ bytevalue(ctype_t ctype, cval_t *val)case CT_AGNUMBER :return agnumber_to_bytes (val->agnumber);case CT_BBOFF : -return (__uint64_t )val->bboff; +return (uint64_t )val->bboff;case CT_BLKOFF : -return (__uint64_t )val->blkoff; +return (uint64_t )val->blkoff;case CT_BYTE :return val->byte;case CT_DADDR :
@@ -143,7 +143,7 @@ bytevalue(ctype_t ctype, cval_t *val)case CT_INOIDX :return inoidx_to_bytes (val->inoidx);case CT_INOOFF : -return (__uint64_t )val->inooff; +return (uint64_t )val->inooff;case CT_NONE :case NCTS :break ;
@@ -160,7 +160,7 @@ convert_f(int argc, char **argv)cval_t cvals[NCTS ] = {};int i;int mask; -__uint64_t v; +uint64_t v;ctype_t wtype;/* move past the "convert" command */
@@ -262,7 +262,7 @@ static int getvalue(char *s, ctype_t ctype, cval_t *val) {char *p; -__uint64_t v; +uint64_t v; v =strtoull (s, &p,0 );if (*p !='\0' ) {
@@ -286,7 +286,7 @@ getvalue(char *s, ctype_t ctype, cval_t *val) val->blkoff = (int )v;break ;case CT_BYTE : - val->byte = (__uint64_t )v; + val->byte = (uint64_t )v;break ;case CT_DADDR : val->daddr = (xfs_daddr_t )v;
db/faddr.c +7 -7
@@ -79,11 +79,11 @@ fa_attrblock( typnm_t next) {bmap_ext_t bm; -__uint32_t bno; +uint32_t bno;xfs_fsblock_t dfsbno;int nex; - bno = (__uint32_t )getbitval (obj, bit,bitsz (bno),BVUNSIGNED ); + bno = (uint32_t )getbitval (obj, bit,bitsz (bno),BVUNSIGNED );if (bno ==0 ) {dbprintf (_ ("null attribute block number, cannot set new addr\n" ));return ;
@@ -96,7 +96,7 @@ fa_attrblock( } dfsbno = bm.startblock + (bno - bm.startoff);ASSERT (typtab[next].typnm == next); -set_cur (&typtab[next], (__int64_t )XFS_FSB_TO_DADDR (mp, dfsbno), blkbb, +set_cur (&typtab[next], (int64_t )XFS_FSB_TO_DADDR (mp, dfsbno), blkbb,DB_RING_ADD ,NULL ); }
@@ -276,11 +276,11 @@ fa_dirblock( {bbmap_t bbmap;bmap_ext_t *bmp; -__uint32_t bno; +uint32_t bno;xfs_fsblock_t dfsbno;int nex; - bno = (__uint32_t )getbitval (obj, bit,bitsz (bno),BVUNSIGNED ); + bno = (uint32_t )getbitval (obj, bit,bitsz (bno),BVUNSIGNED );if (bno ==0 ) {dbprintf (_ ("null directory block number, cannot set new addr\n" ));return ;
@@ -297,7 +297,7 @@ fa_dirblock(ASSERT (typtab[next].typnm == next);if (nex >1 )make_bbmap (&bbmap, nex, bmp); -set_cur (&typtab[next], (__int64_t )XFS_FSB_TO_DADDR (mp, dfsbno), +set_cur (&typtab[next], (int64_t )XFS_FSB_TO_DADDR (mp, dfsbno),XFS_FSB_TO_BB (mp, mp->m_dir_geo->fsbcount),DB_RING_ADD , nex >1 ? &bbmap :NULL );free (bmp);
@@ -317,7 +317,7 @@ fa_drfsbno(return ; }ASSERT (typtab[next].typnm == next); -set_cur (&typtab[next], (__int64_t )XFS_FSB_TO_BB (mp, bno), blkbb, +set_cur (&typtab[next], (int64_t )XFS_FSB_TO_BB (mp, bno), blkbb,DB_RING_ADD ,NULL ); }
db/field.c +22 -22
99 lines not on this page · raw message
db/fprint.c +4 -4
@@ -80,7 +80,7 @@ fp_num(int bitpos;int i;int isnull; -__int64_t val; +int64_t val; for (i = 0, bitpos = bit; i < count && !seenint();
@@ -100,7 +100,7 @@ fp_num(else if (size >32 )dbprintf (fmtstr, val);else -dbprintf (fmtstr, (__int32_t )val); +dbprintf (fmtstr, (int32_t )val);if (i < count -1 )dbprintf (" " ); }
@@ -203,7 +203,7 @@ fp_crc( {int bitpos;int i; -__int64_t val; +int64_t val;char *ok;switch (iocur_crc_valid ()) {
@@ -230,7 +230,7 @@ fp_crc(if (size >32 )dbprintf (fmtstr, val, ok);else -dbprintf (fmtstr, (__int32_t )val, ok); +dbprintf (fmtstr, (int32_t )val, ok);if (i < count -1 )dbprintf (" " ); }
db/frag.c +4 -4
@@ -42,8 +42,8 @@ typedef struct extmap {static int aflag;static int dflag; -static __uint64_t extcount_actual; -static __uint64_t extcount_ideal; +static uint64_t extcount_actual; +static uint64_t extcount_ideal;static int fflag;static int lflag;static int qflag;
@@ -306,8 +306,8 @@ process_inode(xfs_agino_t agino, xfs_dinode_t *dip) { - __uint64_t actual; -__uint64_t ideal; + uint64_t actual; +uint64_t ideal;xfs_ino_t ino;int skipa;int skipd;
db/inode.c +15 -15
@@ -119,49 +119,49 @@ const field_t inode_core_flds[] = { { "dmstate", FLDT_UINT16D, OI(COFF(dmstate)), C1, 0, TYP_NONE }, { "flags", FLDT_UINT16X, OI(COFF(flags)), C1, FLD_SKIPALL, TYP_NONE }, { "newrtbm", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_NEWRTBM_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_NEWRTBM_BIT -1 ),C1 , 0, TYP_NONE }, { "prealloc", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_PREALLOC_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_PREALLOC_BIT -1 ),C1 , 0, TYP_NONE }, { "realtime", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_REALTIME_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_REALTIME_BIT -1 ),C1 , 0, TYP_NONE }, { "immutable", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_IMMUTABLE_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_IMMUTABLE_BIT -1 ),C1 , 0, TYP_NONE }, { "append", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_APPEND_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_APPEND_BIT -1 ),C1 , 0, TYP_NONE }, { "sync", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_SYNC_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_SYNC_BIT -1 ),C1 , 0, TYP_NONE }, { "noatime", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_NOATIME_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_NOATIME_BIT -1 ),C1 , 0, TYP_NONE }, { "nodump", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_NODUMP_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_NODUMP_BIT -1 ),C1 , 0, TYP_NONE }, { "rtinherit", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_RTINHERIT_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_RTINHERIT_BIT -1 ),C1 , 0, TYP_NONE }, { "projinherit", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_PROJINHERIT_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_PROJINHERIT_BIT -1 ),C1 , 0, TYP_NONE }, { "nosymlinks", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_NOSYMLINKS_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_NOSYMLINKS_BIT -1 ),C1 , 0, TYP_NONE }, { "extsz", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_EXTSIZE_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_EXTSIZE_BIT -1 ),C1 , 0, TYP_NONE }, { "extszinherit", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_EXTSZINHERIT_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_EXTSZINHERIT_BIT -1 ),C1 , 0, TYP_NONE }, { "nodefrag", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_NODEFRAG_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_NODEFRAG_BIT -1 ),C1 , 0, TYP_NONE }, { "filestream", FLDT_UINT1, -OI (COFF (flags) +bitsz (__uint16_t) -XFS_DIFLAG_FILESTREAM_BIT -1 ),C1 , +OI (COFF (flags) +bitsz (uint16_t) -XFS_DIFLAG_FILESTREAM_BIT -1 ),C1 , 0, TYP_NONE }, { "gen", FLDT_UINT32D, OI(COFF(gen)), C1, 0, TYP_NONE }, { NULL }
db/io.c +2 -2
@@ -487,7 +487,7 @@ write_cur(void)void set_cur (const typ_t *t, -__int64_t d, +int64_t d,int c,int ring_flag,bbmap_t *bbmap)
@@ -495,7 +495,7 @@ set_cur(struct xfs_buf *bp;xfs_ino_t dirino;xfs_ino_t ino; -__uint16_t mode; +uint16_t mode;const struct xfs_buf_ops *ops = t ? t->bops :NULL ;if (iocur_sp <0 ) {
db/io.h +4 -4
@@ -25,7 +25,7 @@ typedef struct bbmap { } bbmap_t; typedef struct iocur { - __int64_t bb; /* BB number in filesystem of buf */ + int64_t bb; /* BB number in filesystem of buf */ int blen; /* length of "buf", bb's */ int boff; /* data - buf */ void *buf; /* base address of buffer */
@@ -33,7 +33,7 @@ typedef struct iocur {xfs_ino_t dirino;/* current directory inode number */ xfs_ino_t ino;/* current inode number */ int len;/* length of "data", bytes */ -__uint16_t mode;/* current inode's mode */ +uint16_t mode;/* current inode's mode */ xfs_off_t off;/* fs offset of "data" in bytes */ const struct typ *typ;/* type of "data" */ bbmap_t *bbmap;/* map daddr if fragmented */
@@ -57,9 +57,9 @@ extern void off_cur(int off, int len);extern void pop_cur (void );extern void print_iocur (char *tag,iocur_t *ioc);extern void push_cur (void ); -extern int read_buf (__int64_t daddr,int count,void *bufp); +extern int read_buf (int64_t daddr,int count,void *bufp);extern void write_cur (void ); -extern void set_cur (const struct typ *t,__int64_t d,int c,int ring_add, +extern void set_cur (const struct typ *t,int64_t d,int c,int ring_add,bbmap_t *bbmap);extern void ring_add (void );extern void set_iocur_type (const struct typ *t);
db/metadump.c +6 -6
@@ -175,7 +175,7 @@ write_index(void)static int write_buf_segment (char *data, -__int64_t off, +int64_t off,int len) {int i;
@@ -1112,7 +1112,7 @@ process_sf_dir( {struct xfs_dir2_sf_hdr *sfp;xfs_dir2_sf_entry_t *sfep; -__uint64_t ino_dir_size; +uint64_t ino_dir_size;int i; sfp = (struct xfs_dir2_sf_hdr *)XFS_DFORK_DPTR (dip);
@@ -1178,7 +1178,7 @@ process_sf_dir(static void obfuscate_path_components (char *buf, -__uint64_t len) +uint64_t len) {unsigned char *comp = (unsigned char *)buf;unsigned char *end = comp + len;
@@ -1215,7 +1215,7 @@ static voidprocess_sf_symlink ( xfs_dinode_t *dip) { -__uint64_t len; +uint64_t len;char *buf; len =be64_to_cpu (dip->di_size);
@@ -1487,7 +1487,7 @@ process_attr_block(xfs_attr_leaf_entry_t *entry;xfs_attr_leaf_name_local_t *local;xfs_attr_leaf_name_remote_t *remote; -__uint32_t bs = mp->m_sb.sb_blocksize; +uint32_t bs = mp->m_sb.sb_blocksize;char *first_name;
@@ -2125,7 +2125,7 @@ done:return success; } -static __uint32_t inodes_copied =0 ; +static uint32_t inodes_copied =0 ;static int copy_inode_chunk(
db/sb.c +3 -3
@@ -606,7 +606,7 @@ version_help(void) }static int -do_version (xfs_agnumber_t agno,__uint16_t version,__uint32_t features) +do_version (xfs_agnumber_t agno,uint16_t version,uint32_t features) {xfs_sb_t tsb;
@@ -708,8 +708,8 @@ version_f(int argc, char **argv) { - __uint16_t version = 0; -__uint32_t features =0 ; + uint16_t version = 0; +uint32_t features =0 ;xfs_agnumber_t ag;if (argc ==2 ) {/* WRITE VERSION */
fsr/xfs_fsr.c +1 -1
@@ -54,7 +54,7 @@ struct getbmap *outmap = NULL;int outmap_size =0 ;int RealUid;int tmp_agi; -static __int64_t minimumfree =2048 ; +static int64_t minimumfree =2048 ;#define MNTTYPE_XFS "xfs"
libhandle/handle.c +1 -1
@@ -232,7 +232,7 @@ obj_to_handle( {char hbuf [MAXHANSIZ ];int ret; -__uint32_t handlen; +uint32_t handlen;xfs_fsop_handlereq_t hreq;if (opcode ==XFS_IOC_FD_TO_HANDLE ) {
libhandle/jdm.c +1 -1
@@ -36,7 +36,7 @@ typedef struct filehandle {fshandle_t fh_fshandle;/* handle of fs containing this inode */ int16_t fh_sz_following;/* bytes in handle after this member */ char fh_pad[FILEHANDLE_SZ_PAD ];/* padding, must be zeroed */ -__uint32_t fh_gen;/* generation count */ +uint32_t fh_gen;/* generation count */ xfs_ino_t fh_ino;/* 64 bit ino */ } filehandle_t;
logprint/log_misc.c +3 -3
@@ -212,12 +212,12 @@ xlog_print_trans_header(char **ptr, int len) {xfs_trans_header_t *h;char *cptr = *ptr; -__uint32_t magic; +uint32_t magic;char *magic_c = (char *)&magic; *ptr += len; - magic=*(__uint32_t *)cptr;/* XXX be32_to_cpu soon */ + magic=*(uint32_t *)cptr;/* XXX be32_to_cpu soon */ if (len >=4 ) {#if __BYTE_ORDER == __LITTLE_ENDIAN
@@ -247,7 +247,7 @@ xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops)int num, skip;int super_block =0 ;int bucket, col, buckets; -__int64_t blkno; +int64_t blkno;xfs_buf_log_format_t lbuf;int size, blen, map_size, struct_size;__be64 x, y;
mdrestore/xfs_mdrestore.c +1 -1
@@ -65,7 +65,7 @@ perform_restore(int mb_count;xfs_metablock_t tmb;xfs_sb_t sb; -__int64_t bytes_read; +int64_t bytes_read;/* * read in first blocks (superblock 0), set "inprogress" flag for it,
mkfs/proto.c +1 -1
@@ -669,7 +669,7 @@ rtinit( mp->m_sb.sb_rbmino = rbmip->i_ino; rbmip->i_d.di_size = mp->m_sb.sb_rbmblocks * mp->m_sb.sb_blocksize; rbmip->i_d.di_flags =XFS_DIFLAG_NEWRTBM ; - *(__uint64_t *)&VFS_I (rbmip)->i_atime =0 ; + *(uint64_t *)&VFS_I (rbmip)->i_atime =0 ;libxfs_trans_log_inode (tp, rbmip,XFS_ILOG_CORE );libxfs_log_sb (tp); mp->m_rbmip = rbmip;
mkfs/xfs_mkfs.c +42 -42
220 lines not on this page · raw message
quota/edit.c +32 -32
127 lines not on this page · raw message
quota/free.c +22 -22
66 lines not on this page · raw message
quota/quot.c +12 -12
@@ -25,17 +25,17 @@typedef struct du {struct du *next; -__uint64_t blocks; -__uint64_t blocks30; -__uint64_t blocks60; -__uint64_t blocks90; -__uint64_t nfiles; -__uint32_t id; +uint64_t blocks; +uint64_t blocks30; +uint64_t blocks60; +uint64_t blocks90; +uint64_t nfiles; +uint32_t id; }du_t ;#define TSIZE 500 -static __uint64_t sizes[TSIZE ]; -static __uint64_t overflow; +static uint64_t sizes[TSIZE ]; +static uint64_t overflow;#define NDU 60000#define DUHASH 8209
@@ -83,8 +83,8 @@ quot_bulkstat_add( {du_t *dp;du_t **hp; -__uint64_t size; -__uint32_t i, id; +uint64_t size; +uint32_t i, id;if ((p->bs_mode &S_IFMT ) ==0 )return ;
@@ -202,7 +202,7 @@ qcompare(return 0 ; } -typedef char *(*idtoname_t )(__uint32_t ); +typedef char *(*idtoname_t )(uint32_t );static void quot_report_mount_any_type(
@@ -290,7 +290,7 @@ quot_histogram_mount(fs_path_t *mount, uint flags) { -__uint64_t t =0 ; + uint64_t t = 0;int i;fprintf (fp,_ ("%s (%s):\n" ), mount->fs_name, mount->fs_dir);
quota/quota.c +2 -2
@@ -51,7 +51,7 @@ quota_help(void) static int quota_mount( FILE *fp, - __uint32_t id, + uint32_t id, char *name, uint form, uint type,
@@ -180,7 +180,7 @@ quota_mount( static void quota( FILE *fp, - __uint32_t id, + uint32_t id, char *name, uint form, uint type,
quota/quota.h +6 -6
@@ -53,9 +53,9 @@ enum {extern char *type_to_string (uint __type);extern char *form_to_string (uint __form);extern char *time_to_string (time_t __time,uint __flags); -extern char *bbs_to_string (__uint64_t __v,char *__c,uint __size); -extern char *num_to_string (__uint64_t __v,char *__c,uint __size); -extern char *pct_to_string (__uint64_t __v,__uint64_t __t,char *__c,uint __s); +extern char *bbs_to_string (uint64_t __v,char *__c,uint __size); +extern char *num_to_string (uint64_t __v,char *__c,uint __size); +extern char *pct_to_string (uint64_t __v,uint64_t __t,char *__c,uint __s);extern FILE *fopen_write_secure (char *__filename);
@@ -81,7 +81,7 @@ enum {* Identifier (uid/gid/prid) cache routines */ #define NMAX 32 -extern char *uid_to_name (__uint32_t __uid); -extern char *gid_to_name (__uint32_t __gid); -extern char *prid_to_name (__uint32_t __prid); +extern char *uid_to_name (uint32_t __uid); +extern char *gid_to_name (uint32_t __gid); +extern char *prid_to_name (uint32_t __prid);extern bool isdigits_only (const char *);
quota/report.c +2 -2
@@ -327,9 +327,9 @@ report_header( static int report_mount( FILE *fp, - __uint32_t id, + uint32_t id, char *name, - __uint32_t *oid, + uint32_t *oid, uint form, uint type, fs_path_t *mount,
quota/state.c +1 -1
@@ -135,7 +135,7 @@ static voidstate_timelimit (FILE *fp, uint form, - __uint32_t timelimit) + uint32_t timelimit) { fprintf(fp, _("%s grace time: %s\n"), form_to_string(form),
quota/util.c +33 -33
138 lines not on this page · raw message
repair/README +1 -1
@@ -189,7 +189,7 @@ D - 0) look at usage of XFS_MAKE_IPTR(). It does the right D - 0) look at references to XFS_INODES_PER_CHUNK. change the - ones that really mean sizeof(__uint64_t)*NBBY to + ones that really mean sizeof(uint64_t)*NBBY to something else (like that only defined as a constant INOS_PER_IREC. this isn't as important since XFS_INODES_PER_CHUNK will never chang
repair/agheader.h +7 -7
@@ -20,7 +20,7 @@ typedef struct fs_geometry {/* * these types should match the superblock types */ -__uint32_t sb_blocksize;/* blocksize (bytes) */ +uint32_t sb_blocksize;/* blocksize (bytes) */ xfs_rfsblock_t sb_dblocks;/* # data blocks */ xfs_rfsblock_t sb_rblocks;/* # realtime blocks */ xfs_rtblock_t sb_rextents;/* # realtime extents */
@@ -30,9 +30,9 @@ typedef struct fs_geometry {xfs_agnumber_t sb_agcount;/* # of ags */ xfs_extlen_t sb_rbmblocks;/* # of rt bitmap blocks */ xfs_extlen_t sb_logblocks;/* # of log blocks */ -__uint16_t sb_sectsize;/* volume sector size (bytes) */ -__uint16_t sb_inodesize;/* inode size (bytes) */ -__uint8_t sb_imax_pct;/* max % of fs for inode space */ +uint16_t sb_sectsize;/* volume sector size (bytes) */ +uint16_t sb_inodesize;/* inode size (bytes) */ +uint8_t sb_imax_pct;/* max % of fs for inode space */ /* * these don't have to match the superblock types but are placed
@@ -49,10 +49,10 @@ typedef struct fs_geometry {/* * fields after this point have to be checked manually in compare_sb() */ -__uint8_t sb_shared_vn;/* shared version number */ +uint8_t sb_shared_vn;/* shared version number */ xfs_extlen_t sb_inoalignmt;/* inode chunk alignment, fsblocks */ -__uint32_t sb_unit;/* stripe or raid unit */ -__uint32_t sb_width;/* stripe or width unit */ +uint32_t sb_unit;/* stripe or raid unit */ +uint32_t sb_width;/* stripe or width unit */ /* * these don't have to match, they track superblock properties
repair/attr_repair.h +13 -13
@@ -32,10 +32,10 @@#define ACL_WRITE 02#define ACL_EXECUTE 01 -typedef __uint16_t xfs_acl_perm_t ; -typedef __int32_t xfs_acl_type_t ; -typedef __int32_t xfs_acl_tag_t ; -typedef __int32_t xfs_acl_id_t ; +typedef uint16_t xfs_acl_perm_t ; +typedef int32_t xfs_acl_type_t ; +typedef int32_t xfs_acl_tag_t ; +typedef int32_t xfs_acl_id_t ;/* * "icacl" = in-core ACL. There is no equivalent in the XFS kernel code,
@@ -50,7 +50,7 @@ struct xfs_icacl_entry { };struct xfs_icacl { -__int32_t acl_cnt; +int32_t acl_cnt;struct xfs_icacl_entry acl_entry[0 ]; };
@@ -59,14 +59,14 @@ struct xfs_icacl {*/ #define XFS_MAC_MAX_SETS 250typedef struct xfs_mac_label { -__uint8_t ml_msen_type;/* MSEN label type */ -__uint8_t ml_mint_type;/* MINT label type */ -__uint8_t ml_level;/* Hierarchical level */ -__uint8_t ml_grade;/* Hierarchical grade */ -__uint16_t ml_catcount;/* Category count */ -__uint16_t ml_divcount;/* Division count */ +uint8_t ml_msen_type;/* MSEN label type */ +uint8_t ml_mint_type;/* MINT label type */ +uint8_t ml_level;/* Hierarchical level */ +uint8_t ml_grade;/* Hierarchical grade */ +uint16_t ml_catcount;/* Category count */ +uint16_t ml_divcount;/* Division count */ /* Category set, then Division set */ -__uint16_t ml_list[XFS_MAC_MAX_SETS ]; +uint16_t ml_list[XFS_MAC_MAX_SETS ]; }xfs_mac_label_t ;/* MSEN label type names. Choose an upper case ASCII character. */
@@ -93,7 +93,7 @@ typedef struct xfs_mac_label {/* * Capabilities (IRIX) */ -typedef __uint64_t xfs_cap_value_t ; +typedef uint64_t xfs_cap_value_t ; typedef struct xfs_cap_set { xfs_cap_value_t cap_effective; /* use in capability checks */
repair/avl64.c +19 -19
@@ -70,8 +70,8 @@ avl64_checktree( avl64node_t *root) {avl64node_t *nlast, *nnext, *np; -__uint64_t offset =0 ; -__uint64_t end; +uint64_t offset =0 ; +uint64_t end; nlast = nnext = root;
@@ -583,8 +583,8 @@ attach:avl64node_t *avl64_findanyrange (avl64tree_desc_t *tree, -__uint64_t start, -__uint64_t end, +uint64_t start, +uint64_t end,int checklen) {avl64node_t *np = tree->avl_root;
@@ -655,7 +655,7 @@ avl64_findanyrange(avl64node_t *avl64_findrange (avl64tree_desc_t *tree, -__uint64_t value) +uint64_t value) {avl64node_t *np = tree->avl_root;
@@ -682,10 +682,10 @@ avl64_findrange(avl64node_t *avl64_find (avl64tree_desc_t *tree, -__uint64_t value) +uint64_t value) {avl64node_t *np = tree->avl_root; -__uint64_t nvalue; +uint64_t nvalue;while (np) { nvalue =AVL_START (tree, np);
@@ -909,8 +909,8 @@ staticavl64node_t *avl64_insert_find_growth (avl64tree_desc_t *tree, -__uint64_t start,/* range start at start, */ -__uint64_t end,/* exclusive */ +uint64_t start,/* range start at start, */ +uint64_t end,/* exclusive */ int *growthp)/* OUT */ {avl64node_t *root = tree->avl_root;
@@ -963,7 +963,7 @@ avl64_insert_grow( int growth) {avl64node_t *nnext; -__uint64_t start =AVL_START (tree, newnode); +uint64_t start =AVL_START (tree, newnode);if (growth ==AVL_BACK ) {
@@ -1005,8 +1005,8 @@ avl64_insert( avl64node_t *newnode) {avl64node_t *np; -__uint64_t start =AVL_START (tree, newnode); -__uint64_t end =AVL_END (tree, newnode); +uint64_t start =AVL_START (tree, newnode); +uint64_t end =AVL_END (tree, newnode);int growth;ASSERT (newnode);
@@ -1159,16 +1159,16 @@ avl64ops_t avl_debug_ops = { avl_debug_end, } -static __uint64_t +static uint64_t avl64_debug_start (avl64node_t *node) { -return (__uint64_t )(struct avl_debug_node *)node->avl_start; +return (uint64_t )(struct avl_debug_node *)node->avl_start; } -static __uint64_t +static uint64_t avl64_debug_end (avl64node_t *node) { -return (__uint64_t) +return (uint64_t ) ((struct avl_debug_node *)node->avl_start + (struct avl_debug_node *)node->avl_size); }
@@ -1304,7 +1304,7 @@ main()avl64node_t *avl64_findadjacent (avl64tree_desc_t *tree, -__uint64_t value, +uint64_t value,int dir) {avl64node_t *np = tree->avl_root;
@@ -1378,8 +1378,8 @@ avl64_findadjacent(void avl64_findranges (avl64tree_desc_t *tree, -__uint64_t start, -__uint64_t end, +uint64_t start, +uint64_t end,avl64node_t **startp,avl64node_t **endp) {
repair/avl64.h +9 -9
@@ -32,8 +32,8 @@ typedef struct avl64node {* avl-tree operations */ typedef struct avl64ops { -__uint64_t (*avl_start)(avl64node_t *); -__uint64_t (*avl_end)(avl64node_t *); +uint64_t (*avl_start)(avl64node_t *); +uint64_t (*avl_end)(avl64node_t *); }avl64ops_t ;/*
@@ -89,32 +89,32 @@ avl64_init_tree(avl64node_t *avl64_findrange (avl64tree_desc_t *tree, -__uint64_t value); +uint64_t value);avl64node_t *avl64_find (avl64tree_desc_t *tree, -__uint64_t value); +uint64_t value);avl64node_t *avl64_findanyrange (avl64tree_desc_t *tree, -__uint64_t start, -__uint64_t end, +uint64_t start, +uint64_t end,int checklen);avl64node_t *avl64_findadjacent (avl64tree_desc_t *tree, -__uint64_t value, +uint64_t value,int dir);void avl64_findranges (avl64tree_desc_t *tree, -__uint64_t start, -__uint64_t end, +uint64_t start, +uint64_t end,avl64node_t **startp,avl64node_t **endp);
repair/dino_chunks.c +1 -1
@@ -826,7 +826,7 @@ next_readbuf:* we do now, this is where to start. */ if (is_used) { -__uint16_t di_mode; +uint16_t di_mode;if (is_inode_free (ino_rec, irec_offset)) {if (verbose || no_modify) {
repair/dinode.c +19 -19
@@ -742,7 +742,7 @@ _("%s fork in ino %" PRIu64 " claims dup extent, "case XR_E_FREE1 :do_warn (_ ("%s fork in ino %" PRIu64" claims free block %" PRIu64"\n" ), - forkname, ino, (__uint64_t ) b); + forkname, ino, (uint64_t ) b);/* fall through ... */ case XR_E_UNKNOWN :set_bmap_ext (agno, agbno, blen,XR_E_INUSE );
@@ -888,7 +888,7 @@ process_btinode(int type, int *dirty, xfs_rfsblock_t *tot, - __uint64_t *nex, + uint64_t *nex, blkmap_t **blkmapp, int whichfork, int check_dups)
@@ -904,7 +904,7 @@ process_btinode(int level;int numrecs;bmap_cursor_t cursor; -__uint64_t magic; +uint64_t magic; dib = (xfs_bmdr_block_t *)XFS_DFORK_PTR (dip, whichfork); lino =XFS_AGINO_TO_INO (mp, agno, ino);
@@ -1063,7 +1063,7 @@ process_exinode(int type, int *dirty, xfs_rfsblock_t *tot, - __uint64_t *nex, + uint64_t *nex, blkmap_t **blkmapp, int whichfork, int check_dups)
@@ -1165,14 +1165,14 @@ process_symlink_extlist(xfs_mount_t *mp, xfs_ino_t lino, xfs_dinode_t *dino)do_warn (_ ("mismatch between format (%d) and size (%" PRId64") in symlink ino %" PRIu64"\n" ), dino->di_format, - (__int64_t )be64_to_cpu (dino->di_size), lino); + (int64_t )be64_to_cpu (dino->di_size), lino);return 1 ; }if (dino->di_format ==XFS_DINODE_FMT_LOCAL ) {do_warn (_ ("mismatch between format (%d) and size (%" PRId64") in symlink inode %" PRIu64"\n" ), dino->di_format, - (__int64_t )be64_to_cpu (dino->di_size), lino); + (int64_t )be64_to_cpu (dino->di_size), lino);return 1 ; }
@@ -1414,22 +1414,22 @@ _("inode %" PRIu64 " has bad inode type (IFMNT)\n"), lino);case XR_INO_CHRDEV :do_warn (_ ("size of character device inode %" PRIu64" != 0 (%" PRId64" bytes)\n" ), lino, - (__int64_t )be64_to_cpu (dino->di_size)); + (int64_t )be64_to_cpu (dino->di_size));break ;case XR_INO_BLKDEV :do_warn (_ ("size of block device inode %" PRIu64" != 0 (%" PRId64" bytes)\n" ), lino, - (__int64_t )be64_to_cpu (dino->di_size)); + (int64_t )be64_to_cpu (dino->di_size));break ;case XR_INO_SOCK :do_warn (_ ("size of socket inode %" PRIu64" != 0 (%" PRId64" bytes)\n" ), lino, - (__int64_t )be64_to_cpu (dino->di_size)); + (int64_t )be64_to_cpu (dino->di_size));break ;case XR_INO_FIFO :do_warn (_ ("size of fifo inode %" PRIu64" != 0 (%" PRId64" bytes)\n" ), lino, - (__int64_t )be64_to_cpu (dino->di_size)); + (int64_t )be64_to_cpu (dino->di_size));break ;default : do_warn(_("Internal error - process_misc_ino_types, "
@@ -1703,12 +1703,12 @@ _("found inode %" PRIu64 " claiming to be a real-time file\n"), lino);break ;case XR_INO_RTBITMAP : -if (size != (__int64_t )mp->m_sb.sb_rbmblocks * +if (size != (int64_t )mp->m_sb.sb_rbmblocks * mp->m_sb.sb_blocksize) {do_warn (_ ("realtime bitmap inode %" PRIu64" has bad size %" PRId64" (should be %" PRIu64")\n" ), lino, size, - (__int64_t ) mp->m_sb.sb_rbmblocks * + (int64_t ) mp->m_sb.sb_rbmblocks * mp->m_sb.sb_blocksize);return 1 ; }
@@ -1777,8 +1777,8 @@ static intprocess_inode_blocks_and_extents ( xfs_dinode_t *dino, xfs_rfsblock_t nblocks, - __uint64_t nextents, - __uint64_t anextents, + uint64_t nextents, + uint64_t anextents, xfs_ino_t lino, int *dirty) {
@@ -1868,7 +1868,7 @@ process_inode_data_fork(int type, int *dirty, xfs_rfsblock_t *totblocks, - __uint64_t *nextents, + uint64_t *nextents, blkmap_t **dblkmap, int check_dups) {
@@ -1977,7 +1977,7 @@ process_inode_attr_fork(int type, int *dirty, xfs_rfsblock_t *atotblocks, - __uint64_t *anextents, + uint64_t *anextents, int check_dups, int extra_attr_check, int *retval)
@@ -2188,8 +2188,8 @@ process_dinode_int(xfs_mount_t *mp,int di_mode;int type;int retval =0 ; -__uint64_t nextents; -__uint64_t anextents; +uint64_t nextents; +uint64_t anextents;xfs_ino_t lino;const int is_free =0 ;const int is_used =1 ;
@@ -2306,7 +2306,7 @@ _("inode identifier %llu mismatch on inode %" PRIu64 "\n"),if (!uncertain)do_warn (_ ("bad (negative) size %" PRId64" on inode %" PRIu64"\n" ), - (__int64_t )be64_to_cpu (dino->di_size), + (int64_t )be64_to_cpu (dino->di_size), lino);if (verify_mode)return 1 ;
repair/dinode.h +2 -2
@@ -46,8 +46,8 @@ process_bmbt_reclist(xfs_mount_t *mp,xfs_ino_t ino, xfs_rfsblock_t *tot, struct blkmap **blkmapp, - __uint64_t *first_key, - __uint64_t *last_key, + uint64_t *first_key, + uint64_t *last_key, int whichfork);int
repair/dir2.c +1 -1
@@ -160,7 +160,7 @@ process_sf_dir2(int bad_sfnamelen;int i;int i8; -__int64_t ino_dir_size; +int64_t ino_dir_size;int ino_off;ino_tree_node_t *irec_p;int junkit;
repair/globals.h +8 -8
@@ -140,7 +140,7 @@ EXTERN int inodes_per_cluster; EXTERN unsigned int glob_agcount; EXTERN int chunks_pblock; /* # of 64-ino chunks per allocation */ EXTERN int max_symlink_blocks; -EXTERN __int64_t fs_max_file_offset; +EXTERN int64_t fs_max_file_offset;/* realtime info */
@@ -160,16 +160,16 @@ EXTERN int full_ino_ex_data;/*/* superblock counters */ -EXTERN __uint64_t sb_icount; /* allocated (made) inodes */ -EXTERN __uint64_t sb_ifree; /* free inodes */ -EXTERN __uint64_t sb_fdblocks; /* free data blocks */ -EXTERN __uint64_t sb_frextents; /* free realtime extents */ +EXTERN uint64_t sb_icount; /* allocated (made) inodes */ +EXTERN uint64_t sb_ifree; /* free inodes */ +EXTERN uint64_t sb_fdblocks; /* free data blocks */ +EXTERN uint64_t sb_frextents; /* free realtime extents *//* superblock geometry info */ EXTERN xfs_extlen_t sb_inoalignmt; -EXTERN __uint32_t sb_unit; -EXTERN __uint32_t sb_width; +EXTERN uint32_t sb_unit; +EXTERN uint32_t sb_width;struct aglock {pthread_mutex_t lock __attribute__((__aligned__ (64 )));
@@ -177,7 +177,7 @@ struct aglock { EXTERN struct aglock *ag_locks; EXTERN int report_interval; -EXTERN __uint64_t *prog_rpt_done; +EXTERN uint64_t *prog_rpt_done; EXTERN int ag_stride; EXTERN int thread_count;
repair/incore.c +5 -5
@@ -179,7 +179,7 @@ get_bmap_ext(static uint64_t *rt_bmap;static size_t rt_bmap_size; -/* block records fit into __uint64_t's units */ +/* block records fit into uint64_t's units */ #define XR_BB_UNIT 64/* number of bits/unit */ #define XR_BB 4/* bits per block record */ #define XR_BB_NUM (XR_BB_UNIT/XR_BB)/* number of records per unit */
@@ -203,8 +203,8 @@ set_rtbmap( { *(rt_bmap + bno /XR_BB_NUM ) = ((*(rt_bmap + bno /XR_BB_NUM ) & - (~((__uint64_t )XR_BB_MASK << ((bno %XR_BB_NUM ) *XR_BB )))) | - (((__uint64_t ) state) << ((bno %XR_BB_NUM ) *XR_BB ))); + (~((uint64_t )XR_BB_MASK << ((bno %XR_BB_NUM ) *XR_BB )))) | + (((uint64_t ) state) << ((bno %XR_BB_NUM ) *XR_BB ))); } static void
@@ -222,9 +222,9 @@ init_rt_bmap(return ; rt_bmap_size =roundup (mp->m_sb.sb_rextents / (NBBY /XR_BB ), -sizeof (__uint64_t)); +sizeof (uint64_t )); - rt_bmap =memalign (sizeof (__uint64_t), rt_bmap_size); + rt_bmap =memalign (sizeof (uint64_t ), rt_bmap_size);if (!rt_bmap) { do_error( _("couldn't allocate realtime block map, size = %" PRIu64 "\n"),
repair/incore.h +21 -21
96 lines not on this page · raw message
repair/incore_ext.c +3 -3
@@ -721,13 +721,13 @@ search_rt_dup_extent(xfs_mount_t *mp, xfs_rtblock_t bno)return (ret); } -static __uint64_t +static uint64_t avl64_rt_ext_start (avl64node_t *node) {return (((rt_extent_tree_node_t *) node)->rt_startblock); } -static __uint64_t +static uint64_t avl64_ext_end (avl64node_t *node) { return(((rt_extent_tree_node_t *) node)->rt_startblock +
@@ -834,7 +834,7 @@ count_extents(xfs_agnumber_t agno, avltree_desc_t *tree, int whichtree)int count_bno_extents_blocks (xfs_agnumber_t agno,uint *numblocks) { -__uint64_t nblocks; +uint64_t nblocks;extent_tree_node_t *node;int i =0 ;
repair/incore_ino.c +36 -36
221 lines not on this page · raw message
repair/phase2.c +1 -1
@@ -173,7 +173,7 @@ phase2( bad_ino_btree =0 ; -set_progress_msg (PROG_FMT_SCAN_AG , (__uint64_t ) glob_agcount); +set_progress_msg (PROG_FMT_SCAN_AG , (uint64_t ) glob_agcount);scan_ags (mp, scan_threads);
repair/phase3.c +3 -3
@@ -122,7 +122,7 @@ phase3(else do_log (_ (" - scan (but don't clear) agi unlinked lists...\n" )); -set_progress_msg (PROG_FMT_AGI_UNLINKED , (__uint64_t ) glob_agcount); +set_progress_msg (PROG_FMT_AGI_UNLINKED , (uint64_t ) glob_agcount);/* first clear the agi unlinked AGI list */ if (!no_modify) {
@@ -142,7 +142,7 @@ phase3(do_log (_ (" - process known inodes and perform inode discovery...\n" )); -set_progress_msg (PROG_FMT_PROCESS_INO , (__uint64_t ) mp->m_sb.sb_icount); +set_progress_msg (PROG_FMT_PROCESS_INO , (uint64_t ) mp->m_sb.sb_icount);process_ags (mp);
@@ -152,7 +152,7 @@ phase3(* process newly discovered inode chunks */ do_log (_ (" - process newly discovered inodes...\n" )); -set_progress_msg (PROG_FMT_NEW_INODES , (__uint64_t ) glob_agcount); +set_progress_msg (PROG_FMT_NEW_INODES , (uint64_t ) glob_agcount); counts =calloc (sizeof (*counts), mp->m_sb.sb_agcount);if (!counts) {
repair/phase4.c +2 -2
@@ -175,7 +175,7 @@ phase4(xfs_mount_t *mp)do_log (_ ("Phase 4 - check for duplicate blocks...\n" ));do_log (_ (" - setting up duplicate extent list...\n" )); -set_progress_msg (PROG_FMT_DUP_EXTENT , (__uint64_t ) glob_agcount); +set_progress_msg (PROG_FMT_DUP_EXTENT , (uint64_t ) glob_agcount); irec =find_inode_rec (mp,XFS_INO_TO_AGNO (mp, mp->m_sb.sb_rootino),XFS_INO_TO_AGINO (mp, mp->m_sb.sb_rootino));
@@ -289,7 +289,7 @@ phase4(xfs_mount_t *mp)reset_bmaps (mp);do_log (_ (" - check for inodes claiming duplicate blocks...\n" )); -set_progress_msg (PROG_FMT_DUP_BLOCKS , (__uint64_t ) mp->m_sb.sb_icount); +set_progress_msg (PROG_FMT_DUP_BLOCKS , (uint64_t ) mp->m_sb.sb_icount);/* * ok, now process the inodes -- signal 2-pass check per inode.
repair/phase5.c +20 -20
@@ -83,9 +83,9 @@ struct agi_stat {xfs_agino_t freecount; }; -static __uint64_t *sb_icount_ag;/* allocated inodes per ag */ -static __uint64_t *sb_ifree_ag;/* free inodes per ag */ -static __uint64_t *sb_fdblocks_ag;/* free data blocks per ag */ +static uint64_t *sb_icount_ag;/* allocated inodes per ag */ +static uint64_t *sb_ifree_ag;/* free inodes per ag */ +static uint64_t *sb_fdblocks_ag;/* free data blocks per ag */ static int mk_incore_fstree (xfs_mount_t *mp,xfs_agnumber_t agno)
@@ -618,14 +618,14 @@ calculate_freespace_cursor(xfs_mount_t *mp, xfs_agnumber_t agno,static void prop_freespace_cursor (xfs_mount_t *mp,xfs_agnumber_t agno,bt_status_t *btree_curs,xfs_agblock_t startblock, -xfs_extlen_t blockcount,int level,__uint32_t magic) +xfs_extlen_t blockcount,int level,uint32_t magic) {struct xfs_btree_block *bt_hdr;xfs_alloc_key_t *bt_key;xfs_alloc_ptr_t *bt_ptr;xfs_agblock_t agbno;bt_stat_level_t *lptr; -__uint32_t crc_magic; +uint32_t crc_magic;if (magic ==XFS_ABTB_MAGIC ) crc_magic =XFS_ABTB_CRC_MAGIC ;
@@ -720,7 +720,7 @@ prop_freespace_cursor(xfs_mount_t *mp, xfs_agnumber_t agno,*/ static xfs_extlen_t build_freespace_tree (xfs_mount_t *mp,xfs_agnumber_t agno, -bt_status_t *btree_curs,__uint32_t magic) +bt_status_t *btree_curs,uint32_t magic) {xfs_agnumber_t i;xfs_agblock_t j;
@@ -731,7 +731,7 @@ build_freespace_tree(xfs_mount_t *mp, xfs_agnumber_t agno,extent_tree_node_t *ext_ptr;bt_stat_level_t *lptr;xfs_extlen_t freeblks; -__uint32_t crc_magic; +uint32_t crc_magic;#ifdef XR_BLD_FREE_TRACE fprintf (stderr,"in build_freespace_tree, agno = %d\n" , agno);
@@ -895,10 +895,10 @@ build_freespace_tree(xfs_mount_t *mp, xfs_agnumber_t agno,*/ static void init_ino_cursor (xfs_mount_t *mp,xfs_agnumber_t agno,bt_status_t *btree_curs, -__uint64_t *num_inos,__uint64_t *num_free_inos,int finobt) +uint64_t *num_inos,uint64_t *num_free_inos,int finobt) { -__uint64_t ninos; -__uint64_t nfinos; +uint64_t ninos; +uint64_t nfinos;int rec_nfinos;int rec_ninos;ino_tree_node_t *ino_rec;
@@ -1144,7 +1144,7 @@ build_agi(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs,*/ static void build_ino_tree (xfs_mount_t *mp,xfs_agnumber_t agno, -bt_status_t *btree_curs,__uint32_t magic, +bt_status_t *btree_curs,uint32_t magic,struct agi_stat *agi_stat,int finobt) {xfs_agnumber_t i;
@@ -1573,10 +1573,10 @@ phase5_func(xfs_mount_t *mp, xfs_agnumber_t agno) { -__uint64_t num_inos; -__uint64_t num_free_inos; -__uint64_t finobt_num_inos; -__uint64_t finobt_num_free_inos; + uint64_t num_inos; +uint64_t num_free_inos; +uint64_t finobt_num_inos; +uint64_t finobt_num_free_inos;bt_status_t bno_btree_curs;bt_status_t bcnt_btree_curs;bt_status_t ino_btree_curs;
@@ -1588,7 +1588,7 @@ phase5_func(xfs_extlen_t freeblks2;#endif xfs_agblock_t num_extents; -__uint32_t magic; +uint32_t magic;struct agi_stat agi_stat = {0 ,};if (verbose)
@@ -1772,7 +1772,7 @@ phase5(xfs_mount_t *mp)xfs_agnumber_t agno;do_log (_ ("Phase 5 - rebuild AG headers and trees...\n" )); -set_progress_msg (PROG_FMT_REBUILD_AG , (__uint64_t )glob_agcount); +set_progress_msg (PROG_FMT_REBUILD_AG , (uint64_t )glob_agcount);#ifdef XR_BLD_FREE_TRACE fprintf(stderr, "inobt level 1, maxrec = %d, minrec = %d\n",
@@ -1798,15 +1798,15 @@ phase5(xfs_mount_t *mp)keep_fsinos (mp);/* allocate per ag counters */ - sb_icount_ag =calloc (mp->m_sb.sb_agcount,sizeof (__uint64_t)); + sb_icount_ag =calloc (mp->m_sb.sb_agcount,sizeof (uint64_t ));if (sb_icount_ag ==NULL )do_error (_ ("cannot alloc sb_icount_ag buffers\n" )); - sb_ifree_ag =calloc (mp->m_sb.sb_agcount,sizeof (__uint64_t)); + sb_ifree_ag =calloc (mp->m_sb.sb_agcount,sizeof (uint64_t ));if (sb_ifree_ag ==NULL )do_error (_ ("cannot alloc sb_ifree_ag buffers\n" )); - sb_fdblocks_ag =calloc (mp->m_sb.sb_agcount,sizeof (__uint64_t)); + sb_fdblocks_ag =calloc (mp->m_sb.sb_agcount,sizeof (uint64_t ));if (sb_fdblocks_ag ==NULL )do_error (_ ("cannot alloc sb_fdblocks_ag buffers\n" ));
repair/phase6.c +8 -8
@@ -82,7 +82,7 @@ typedef struct dir_hash_ent {struct dir_hash_ent *nextbyhash;/* next in name bucket */ struct dir_hash_ent *nextbyorder;/* next in order added */ xfs_dahash_t hashval;/* hash value of name */ -__uint32_t address;/* offset of data entry */ +uint32_t address;/* offset of data entry */ xfs_ino_t inum;/* inode num of entry */ short junkit;/* name starts with / */ short seen;/* have seen leaf entry */
@@ -170,11 +170,11 @@ static intdir_hash_add ( xfs_mount_t *mp, dir_hash_tab_t *hashtab, - __uint32_t addr, + uint32_t addr, xfs_ino_t inum, int namelen, unsigned char *name, - __uint8_t ftype) + uint8_t ftype) {xfs_dahash_t hash =0 ;int byaddr;
@@ -357,7 +357,7 @@ static voiddir_hash_update_ftype ( dir_hash_tab_t *hashtab, xfs_dir2_dataptr_t addr, - __uint8_t ftype) + uint8_t ftype) {int i;dir_hash_ent_t *p;
@@ -1814,8 +1814,8 @@ longform_dir2_entry_check_data(/* validate ftype field if supported */ if (xfs_sb_version_hasftype (&mp->m_sb)) { -__uint8_t dir_ftype; -__uint8_t ino_ftype; +uint8_t dir_ftype; +uint8_t ino_ftype; dir_ftype =M_DIROPS (mp)->data_get_ftype (dep); ino_ftype =get_inode_ftype (irec, ino_offset);
@@ -2725,8 +2725,8 @@ _("entry \"%s\" (ino %" PRIu64 ") in dir %" PRIu64 " is a duplicate name"),/* validate ftype field if supported */ if (xfs_sb_version_hasftype (&mp->m_sb)) { -__uint8_t dir_ftype; -__uint8_t ino_ftype; +uint8_t dir_ftype; +uint8_t ino_ftype; dir_ftype =M_DIROPS (mp)->sf_get_ftype (sfep); ino_ftype =get_inode_ftype (irec, ino_offset);
repair/phase7.c +3 -3
@@ -32,7 +32,7 @@ static voidupdate_inode_nlinks ( xfs_mount_t *mp, xfs_ino_t ino, - __uint32_t nlinks) + uint32_t nlinks) {xfs_trans_t *tp;xfs_inode_t *ip;
@@ -106,7 +106,7 @@ do_link_updates( {ino_tree_node_t *irec;int j; -__uint32_t nrefs; +uint32_t nrefs;for (irec =findfirst_inode_rec (agno); irec; irec =next_ino_rec (irec)) {
@@ -145,7 +145,7 @@ phase7(else do_log (_ ("Phase 7 - verify link counts...\n" )); -set_progress_msg (PROGRESS_FMT_CORR_LINK , (__uint64_t ) glob_agcount); +set_progress_msg (PROGRESS_FMT_CORR_LINK , (uint64_t ) glob_agcount);create_work_queue (&wq, mp, scan_threads);
repair/progress.c +15 -15
@@ -85,8 +85,8 @@ pthread_t report_thread;typedef struct msg_block_s {pthread_mutex_t mutex;progress_rpt_t *format; -__uint64_t *done; -__uint64_t *total; +uint64_t *done; +uint64_t *total;int count;int interval; }msg_block_t ;
@@ -96,14 +96,14 @@ typedef struct phase_times_s {time_t start;time_t end;time_t duration; -__uint64_t item_counts[4 ]; +uint64_t item_counts[4 ]; } phase_times_t;static phase_times_t phase_times[8 ];static void *progress_rpt_thread (void *);static int current_phase;static int running; -static __uint64_t prog_rpt_total; +static uint64_t prog_rpt_total;void init_progress_rpt (void )
@@ -113,11 +113,11 @@ init_progress_rpt (void)* allocate the done vector */ -if ((prog_rpt_done = (__uint64_t *) -malloc (sizeof (__uint64_t)*glob_agcount)) ==NULL ) { +if ((prog_rpt_done = (uint64_t *) +malloc (sizeof (uint64_t )*glob_agcount)) ==NULL ) {do_error (_ ("cannot malloc pointer to done vector\n" )); } -bzero (prog_rpt_done,sizeof (__uint64_t)*glob_agcount); +bzero (prog_rpt_done,sizeof (uint64_t )*glob_agcount);/* * Setup comm block, start the thread
@@ -165,10 +165,10 @@ progress_rpt_thread (void *p)timer_t timerid;struct itimerspec timespec;char *msgbuf; -__uint64_t *donep; -__uint64_t sum; +uint64_t *donep; +uint64_t sum;msg_block_t *msgp = (msg_block_t *)p; -__uint64_t percent; +uint64_t percent;/* It's possible to get here very early w/ no progress msg set */ if (!msgp->format)
@@ -286,7 +286,7 @@ progress_rpt_thread (void *p) }int -set_progress_msg (int report,__uint64_t total) +set_progress_msg (int report,uint64_t total) {if (!ag_stride)
@@ -300,7 +300,7 @@ set_progress_msg (int report, __uint64_t total)/* reset all the accumulative totals */ if (prog_rpt_done) -bzero (prog_rpt_done,sizeof (__uint64_t)*glob_agcount); +bzero (prog_rpt_done,sizeof (uint64_t )*glob_agcount);if (pthread_mutex_unlock (&global_msgs.mutex))do_error (_ ("set_progress_msg: cannot unlock progress mutex\n" ));
@@ -308,14 +308,14 @@ set_progress_msg (int report, __uint64_t total)return (0 ); } -__uint64_t +uint64_t print_final_rpt (void ) {int i;struct tm *tmp;time_t now; -__uint64_t *donep; -__uint64_t sum; +uint64_t *donep; +uint64_t sum;msg_block_t *msgp = &global_msgs;char msgbuf[DURATION_BUF_SIZE ];
repair/progress.h +2 -2
@@ -32,8 +32,8 @@extern void init_progress_rpt (void );extern void stop_progress_rpt (void );extern void summary_report (void ); -extern int set_progress_msg (int report,__uint64_t total); -extern __uint64_t print_final_rpt (void ); +extern int set_progress_msg (int report,uint64_t total); +extern uint64_t print_final_rpt (void );extern char *timestamp (int end,int phase,char *buf);extern char *duration (int val,char *buf);extern int do_parallel;
repair/sb.c +5 -5
@@ -41,7 +41,7 @@ copy_sb(xfs_sb_t *source, xfs_sb_t *dest)xfs_ino_t uquotino;xfs_ino_t gquotino;xfs_ino_t pquotino; -__uint16_t versionnum; +uint16_t versionnum; rootino = dest->sb_rootino; rbmino = dest->sb_rbmino;
@@ -264,7 +264,7 @@ sb_validate_ino_align(struct xfs_sb *sb)int verify_sb (char *sb_buf,xfs_sb_t *sb,int is_primary_sb) { -__uint32_t bsize; +uint32_t bsize;int i;/* check magic number and version number */
@@ -329,13 +329,13 @@ verify_sb(char *sb_buf, xfs_sb_t *sb, int is_primary_sb)if (sb->sb_dblocks ==0 || sb->sb_dblocks > - ((__uint64_t )sb->sb_agcount * sb->sb_agblocks) || + ((uint64_t )sb->sb_agcount * sb->sb_agblocks) || sb->sb_dblocks < - ((__uint64_t)(sb->sb_agcount -1 ) * sb->sb_agblocks + ((uint64_t )(sb->sb_agcount -1 ) * sb->sb_agblocks +XFS_MIN_AG_BLOCKS ))return (XR_BAD_FS_SIZE_DATA ); -if (sb->sb_agblklog != (__uint8_t )libxfs_log2_roundup (sb->sb_agblocks)) +if (sb->sb_agblklog != (uint8_t )libxfs_log2_roundup (sb->sb_agblocks))return (XR_BAD_FS_SIZE_DATA ); if (sb->sb_inodesize < XFS_DINODE_MIN_SIZE ||
repair/scan.c +21 -21
116 lines not on this page · raw message
repair/scan.h +6 -6
@@ -30,23 +30,23 @@ int scan_lbtree(xfs_fsblock_t bno, xfs_ino_t ino, xfs_rfsblock_t *tot, - __uint64_t *nex, + uint64_t *nex, struct blkmap **blkmapp, bmap_cursor_t *bm_cursor, int isroot, int check_dups, int *dirty, - __uint64_t magic), + uint64_t magic), int type, int whichfork, xfs_ino_t ino, xfs_rfsblock_t *tot, - __uint64_t *nex, + uint64_t *nex, struct blkmap **blkmapp, bmap_cursor_t *bm_cursor, int isroot, int check_dups, - __uint64_t magic, + uint64_t magic, const struct xfs_buf_ops *ops); int scan_bmapbt(
@@ -57,13 +57,13 @@ int scan_bmapbt(xfs_fsblock_t bno, xfs_ino_t ino, xfs_rfsblock_t *tot, - __uint64_t *nex, + uint64_t *nex, struct blkmap **blkmapp, bmap_cursor_t *bm_cursor, int isroot, int check_dups, int *dirty, - __uint64_t magic); + uint64_t magic);void scan_ags(
Signature · 6 lines
2.7.3 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 9 lines · Felix Janda
The uint*_t and int*_t are defined by C99 and should be prefered over the less portable __uint*_t and __int*_t variants. The necessary <
stdint.h> include is inplatformdefs.h, which gets included in most places vialibxfs.h.For now, only replace all __uint*_t types to uint*_t and likewise for __int*_t outside the directories
include/and libxfs/.Signed-off-by Felix Janda <[email protected]>
.....
Quoted 1 line
58 files changed, 502 insertions(+), 502 deletions(-)
Because of the amount of churn this will cause outstanding patchsets (e.g. the rmap/reflink work), this isn't the best time for us to be committing tree-wide cleanups like this. Once we get the major changes that are pending reviewed and committed I have no problems with making these changes, so perhaps you could regenerate the patch once those are merged?
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 11 lines · Dave Chinner
Quoted 9 lines · Felix Janda
The uint*_t and int*_t are defined by C99 and should be prefered over the less portable __uint*_t and __int*_t variants. The necessary <
stdint.h> include is inplatformdefs.h, which gets included in most places vialibxfs.h.For now, only replace all __uint*_t types to uint*_t and likewise for __int*_t outside the directories
include/and libxfs/.Signed-off-by Felix Janda <[email protected]>.....
Quoted 8 lines
Quoted 1 line
58 files changed, 502 insertions(+), 502 deletions(-)Because of the amount of churn this will cause outstanding patchsets (e.g. the rmap/reflink work), this isn't the best time for us to be committing tree-wide cleanups like this. Once we get the major changes that are pending reviewed and committed I have no problems with making these changes, so perhaps you could regenerate the patch once those are merged?
Of course.
Thanks,
Felix
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs