xfsprogs: Remove trailing blanks on various places

Clean up the code a little by removing blank characters on line ends.
Most of these (if not all) sits there for long time and it is probable
that without this explicit removal, they will stay in the code for much
longer.

Signed-off-by: Jan Tulak <jtulak@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index 62edfc834b2fdde213bba1fcbfe2bf4db4a62291..15a3f337d81139a1fee3621cd30cbad355bafdc0 100644 (file)
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -1054,8 +1054,8 @@ main(int argc, char **argv)
                                 * range bigger than required
                                 */
 
-                               sizeb = XFS_AGB_TO_DADDR(mp, agno, 
-                                       be32_to_cpu(rec_ptr->ar_startblock)) - 
+                               sizeb = XFS_AGB_TO_DADDR(mp, agno,
+                                       be32_to_cpu(rec_ptr->ar_startblock)) -
                                                begin;
                                size = roundup(sizeb <<BBSHIFT, wbuf_miniosize);
                                if (size > 0)  {

diff --git a/copy/xfs_copy.h b/copy/xfs_copy.h
index 6b94130e28bd30dfdd6bedcc89ea8443dd42c0b3..27370688633a21c1acb2c7243be9dc2d61168e95 100644 (file)
--- a/copy/xfs_copy.h
+++ b/copy/xfs_copy.h
@@ -87,4 +87,3 @@ typedef struct {
        int             error;
        int             err_type;
 } target_control;
-

diff --git a/db/bmap.c b/db/bmap.c
index 92057b4f01046549aa34e73e04b522dab6a58e20..c71b6b4a5b42ebab66856d161d38d188558ef136 100644 (file)
--- a/db/bmap.c
+++ b/db/bmap.c
@@ -92,7 +92,7 @@ bmap(
                fsize = XFS_DFORK_SIZE(dip, mp, whichfork);
                pp = XFS_BMDR_PTR_ADDR(rblock, 1, xfs_bmdr_maxrecs(fsize, 0));
                kp = XFS_BMDR_KEY_ADDR(rblock, 1);
-               bno = select_child(curoffset, kp, pp, 
+               bno = select_child(curoffset, kp, pp,
                                        be16_to_cpu(rblock->bb_numrecs));
                for (;;) {
                        set_cur(&typtab[typ], XFS_FSB_TO_DADDR(mp, bno),

diff --git a/db/check.c b/db/check.c
index 341a83c4c054dd0dc170b19c337828b717b29984..838db53f7572c6c84a2ab3420427effa3e6e96b0 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -2194,7 +2194,7 @@ process_btinode(
        }
        if (be16_to_cpu(dib->bb_level) == 0) {
                xfs_bmbt_rec_t  *rp = XFS_BMDR_REC_ADDR(dib, 1);
-               process_bmbt_reclist(rp, be16_to_cpu(dib->bb_numrecs), type, 
+               process_bmbt_reclist(rp, be16_to_cpu(dib->bb_numrecs), type,
                                                        id, totd, blkmapp);
                *nex += be16_to_cpu(dib->bb_numrecs);
                return;
@@ -2202,10 +2202,10 @@ process_btinode(
                pp = XFS_BMDR_PTR_ADDR(dib, 1, xfs_bmdr_maxrecs(
                                XFS_DFORK_SIZE(dip, mp, whichfork), 0));
                for (i = 0; i < be16_to_cpu(dib->bb_numrecs); i++)
-                       scan_lbtree(be64_to_cpu(pp[i]), 
-                                       be16_to_cpu(dib->bb_level), 
-                                       scanfunc_bmap, type, id, totd, toti, 
-                                       nex, blkmapp, 1, 
+                       scan_lbtree(be64_to_cpu(pp[i]),
+                                       be16_to_cpu(dib->bb_level),
+                                       scanfunc_bmap, type, id, totd, toti,
+                                       nex, blkmapp, 1,
                                        whichfork == XFS_DATA_FORK ?
                                                TYP_BMAPBTD : TYP_BMAPBTA);
        }
@@ -2341,7 +2341,7 @@ process_data_dir_v2(
                                bf_err += (freeseen & (1 << i)) != 0;
                                freeseen |= 1 << i;
                        } else
-                               bf_err += be16_to_cpu(dup->length) > 
+                               bf_err += be16_to_cpu(dup->length) >
                                                be16_to_cpu(bf[2].length);
                        ptr += be16_to_cpu(dup->length);
                        lastfree = 1;
@@ -2426,19 +2426,19 @@ process_data_dir_v2(
                        if ((char *)&lep[i] >= endptr) {
                                if (!sflag || v)
                                        dbprintf(_("dir %lld block %d bad count "
-                                                "%u\n"), id->ino, dabno, 
+                                                "%u\n"), id->ino, dabno,
                                                be32_to_cpu(btp->count));
                                error++;
                                break;
                        }
                        if (be32_to_cpu(lep[i].address) == XFS_DIR2_NULL_DATAPTR)
                                stale++;
-                       else if (dir_hash_see(be32_to_cpu(lep[i].hashval), 
+                       else if (dir_hash_see(be32_to_cpu(lep[i].hashval),
                                                be32_to_cpu(lep[i].address))) {
                                if (!sflag || v)
                                        dbprintf(_("dir %lld block %d extra leaf "
-                                                "entry %x %x\n"), 
-                                               id->ino, dabno, 
+                                                "entry %x %x\n"),
+                                               id->ino, dabno,
                                                be32_to_cpu(lep[i].hashval),
                                                be32_to_cpu(lep[i].address));
                                error++;
@@ -2457,8 +2457,8 @@ process_data_dir_v2(
            count != be32_to_cpu(btp->count) - be32_to_cpu(btp->stale)) {
                if (!sflag || v)
                        dbprintf(_("dir %lld block %d bad block tail count %d "
-                                "(stale %d)\n"), 
-                               id->ino, dabno, be32_to_cpu(btp->count), 
+                                "(stale %d)\n"),
+                               id->ino, dabno, be32_to_cpu(btp->count),
                                be32_to_cpu(btp->stale));
                error++;
        }
@@ -2599,7 +2599,7 @@ process_exinode(
 
        rp = (xfs_bmbt_rec_t *)XFS_DFORK_PTR(dip, whichfork);
        *nex = XFS_DFORK_NEXTENTS(dip, whichfork);
-       if (*nex < 0 || *nex > XFS_DFORK_SIZE(dip, mp, whichfork) / 
+       if (*nex < 0 || *nex > XFS_DFORK_SIZE(dip, mp, whichfork) /
                                                sizeof(xfs_bmbt_rec_t)) {
                if (!sflag || id->ilist)
                        dbprintf(_("bad number of extents %d for inode %lld\n"),
@@ -3063,7 +3063,7 @@ process_leaf_node_dir_v3_free(
 
        free = iocur_top->data;
        maxent = M_DIROPS(mp)->free_max_bests(mp->m_dir_geo);
-       if (be32_to_cpu(free->hdr.firstdb) != xfs_dir2_da_to_db(mp->m_dir_geo, 
+       if (be32_to_cpu(free->hdr.firstdb) != xfs_dir2_da_to_db(mp->m_dir_geo,
                                        dabno - mp->m_dir_geo->freeblk) * maxent) {
                if (!sflag || v)
                        dbprintf(_("bad free block firstdb %d for dir ino %lld "
@@ -3072,14 +3072,14 @@ process_leaf_node_dir_v3_free(
                error++;
                return;
        }
-       if (be32_to_cpu(free->hdr.nvalid) > maxent || 
-                               be32_to_cpu(free->hdr.nused) > maxent || 
-                               be32_to_cpu(free->hdr.nused) > 
+       if (be32_to_cpu(free->hdr.nvalid) > maxent ||
+                               be32_to_cpu(free->hdr.nused) > maxent ||
+                               be32_to_cpu(free->hdr.nused) >
                                        be32_to_cpu(free->hdr.nvalid)) {
                if (!sflag || v)
                        dbprintf(_("bad free block nvalid/nused %d/%d for dir "
                                 "ino %lld block %d\n"),
-                               be32_to_cpu(free->hdr.nvalid), 
+                               be32_to_cpu(free->hdr.nvalid),
                                be32_to_cpu(free->hdr.nused), id->ino, dabno);
                error++;
                return;
@@ -3093,21 +3093,21 @@ process_leaf_node_dir_v3_free(
                        if (!sflag || v)
                                dbprintf(_("bad free block ent %d is %d should "
                                         "be %d for dir ino %lld block %d\n"),
-                                       i, be16_to_cpu(free->bests[i]), ent, 
+                                       i, be16_to_cpu(free->bests[i]), ent,
                                        id->ino, dabno);
                        error++;
                }
                if (be16_to_cpu(free->bests[i]) != NULLDATAOFF)
                        used++;
                if (ent != NULLDATAOFF)
-                       freetab->ents[be32_to_cpu(free->hdr.firstdb) + i] = 
+                       freetab->ents[be32_to_cpu(free->hdr.firstdb) + i] =
                                                                NULLDATAOFF;
        }
        if (used != be32_to_cpu(free->hdr.nused)) {
                if (!sflag || v)
                        dbprintf(_("bad free block nused %d should be %d for dir "
                                 "ino %lld block %d\n"),
-                               be32_to_cpu(free->hdr.nused), used, id->ino, 
+                               be32_to_cpu(free->hdr.nused), used, id->ino,
                                dabno);
                error++;
        }
@@ -3141,7 +3141,7 @@ process_leaf_node_dir_v2_free(
                return;
        }
        maxent = M_DIROPS(mp)->free_max_bests(mp->m_dir_geo);
-       if (be32_to_cpu(free->hdr.firstdb) != xfs_dir2_da_to_db(mp->m_dir_geo, 
+       if (be32_to_cpu(free->hdr.firstdb) != xfs_dir2_da_to_db(mp->m_dir_geo,
                                        dabno - mp->m_dir_geo->freeblk) * maxent) {
                if (!sflag || v)
                        dbprintf(_("bad free block firstdb %d for dir ino %lld "
@@ -3150,16 +3150,16 @@ process_leaf_node_dir_v2_free(
                error++;
                return;
        }
-       if (be32_to_cpu(free->hdr.nvalid) > maxent || 
+       if (be32_to_cpu(free->hdr.nvalid) > maxent ||
                                be32_to_cpu(free->hdr.nvalid) < 0 ||
-                               be32_to_cpu(free->hdr.nused) > maxent || 
+                               be32_to_cpu(free->hdr.nused) > maxent ||
                                be32_to_cpu(free->hdr.nused) < 0 ||
-                               be32_to_cpu(free->hdr.nused) > 
+                               be32_to_cpu(free->hdr.nused) >
                                        be32_to_cpu(free->hdr.nvalid)) {
                if (!sflag || v)
                        dbprintf(_("bad free block nvalid/nused %d/%d for dir "
                                 "ino %lld block %d\n"),
-                               be32_to_cpu(free->hdr.nvalid), 
+                               be32_to_cpu(free->hdr.nvalid),
                                be32_to_cpu(free->hdr.nused), id->ino, dabno);
                error++;
                return;
@@ -3173,21 +3173,21 @@ process_leaf_node_dir_v2_free(
                        if (!sflag || v)
                                dbprintf(_("bad free block ent %d is %d should "
                                         "be %d for dir ino %lld block %d\n"),
-                                       i, be16_to_cpu(free->bests[i]), ent, 
+                                       i, be16_to_cpu(free->bests[i]), ent,
                                        id->ino, dabno);
                        error++;
                }
                if (be16_to_cpu(free->bests[i]) != NULLDATAOFF)
                        used++;
                if (ent != NULLDATAOFF)
-                       freetab->ents[be32_to_cpu(free->hdr.firstdb) + i] = 
+                       freetab->ents[be32_to_cpu(free->hdr.firstdb) + i] =
                                                                NULLDATAOFF;
        }
        if (used != be32_to_cpu(free->hdr.nused)) {
                if (!sflag || v)
                        dbprintf(_("bad free block nused %d should be %d for dir "
                                 "ino %lld block %d\n"),
-                               be32_to_cpu(free->hdr.nused), used, id->ino, 
+                               be32_to_cpu(free->hdr.nused), used, id->ino,
                                dabno);
                error++;
        }
@@ -3236,13 +3236,13 @@ process_leaf_node_dir_v2_int(
        switch (be16_to_cpu(leaf->hdr.info.magic)) {
        case XFS_DIR2_LEAF1_MAGIC:
        case XFS_DIR3_LEAF1_MAGIC:
-               if (be32_to_cpu(leaf->hdr.info.forw) || 
+               if (be32_to_cpu(leaf->hdr.info.forw) ||
                                        be32_to_cpu(leaf->hdr.info.back)) {
                        if (!sflag || v)
                                dbprintf(_("bad leaf block forw/back pointers "
                                         "%d/%d for dir ino %lld block %d\n"),
                                        be32_to_cpu(leaf->hdr.info.forw),
-                                       be32_to_cpu(leaf->hdr.info.back), 
+                                       be32_to_cpu(leaf->hdr.info.back),
                                        id->ino, dabno);
                        error++;
                }
@@ -3257,7 +3257,7 @@ process_leaf_node_dir_v2_int(
                ltp = xfs_dir2_leaf_tail_p(mp->m_dir_geo, leaf);
                lbp = xfs_dir2_leaf_bests_p(ltp);
                for (i = 0; i < be32_to_cpu(ltp->bestcount); i++) {
-                       if (freetab->nents <= i || freetab->ents[i] != 
+                       if (freetab->nents <= i || freetab->ents[i] !=
                                                be16_to_cpu(lbp[i])) {
                                if (!sflag || v)
                                        dbprintf(_("bestfree %d for dir ino %lld "
@@ -3287,7 +3287,7 @@ process_leaf_node_dir_v2_int(
                        if (!sflag || v)
                                dbprintf(_("bad node block level %d for dir ino "
                                         "%lld block %d\n"),
-                                       nodehdr.level, id->ino, 
+                                       nodehdr.level, id->ino,
                                        dabno);
                        error++;
                }
@@ -3296,7 +3296,7 @@ process_leaf_node_dir_v2_int(
                if (!sflag || v)
                        dbprintf(_("bad directory data magic # %#x for dir ino "
                                 "%lld block %d\n"),
-                               be16_to_cpu(leaf->hdr.info.magic), id->ino, 
+                               be16_to_cpu(leaf->hdr.info.magic), id->ino,
                                dabno);
                error++;
                return;
@@ -3305,11 +3305,11 @@ process_leaf_node_dir_v2_int(
        for (i = stale = 0; i < xfs_dir3_leaf_ents_count(leaf); i++) {
                if (be32_to_cpu(lep[i].address) == XFS_DIR2_NULL_DATAPTR)
                        stale++;
-               else if (dir_hash_see(be32_to_cpu(lep[i].hashval), 
+               else if (dir_hash_see(be32_to_cpu(lep[i].hashval),
                                                be32_to_cpu(lep[i].address))) {
                        if (!sflag || v)
                                dbprintf(_("dir %lld block %d extra leaf entry "
-                                        "%x %x\n"), id->ino, dabno, 
+                                        "%x %x\n"), id->ino, dabno,
                                        be32_to_cpu(lep[i].hashval),
                                        be32_to_cpu(lep[i].address));
                        error++;
@@ -3630,7 +3630,7 @@ process_sf_dir_v2(
                        M_DIROPS(mp)->sf_entsize(sf, sfe->namelen);
                sfe = M_DIROPS(mp)->sf_nextentry(sf, sfe);
        }
-       if (i < 0 && (intptr_t)sfe - (intptr_t)sf != 
+       if (i < 0 && (intptr_t)sfe - (intptr_t)sf !=
                                        be64_to_cpu(dip->di_size)) {
                if (!sflag)
                        dbprintf(_("dir %llu size is %lld, should be %u\n"),
@@ -4162,7 +4162,7 @@ scanfunc_bmap(
        }
        pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[0]);
        for (i = 0; i < be16_to_cpu(block->bb_numrecs); i++)
-               scan_lbtree(be64_to_cpu(pp[i]), level, scanfunc_bmap, type, id, 
+               scan_lbtree(be64_to_cpu(pp[i]), level, scanfunc_bmap, type, id,
                                        totd, toti, nex, blkmapp, 0, btype);
 }
 

diff --git a/db/dir2sf.c b/db/dir2sf.c
index a56590b0bad5250f6bb4f04bd2037e01c8733356..d2b02c1c547af60bc6c748567fff6e56c77c3103 100644 (file)
--- a/db/dir2sf.c
+++ b/db/dir2sf.c
@@ -273,4 +273,3 @@ const field_t       dir3_sf_entry_flds[] = {
          FLD_OFFSET, TYP_NONE },
        { NULL }
 };
-

diff --git a/db/frag.c b/db/frag.c
index 1cc922eff1f655f963459caccf8c3198b7a77e33..3beb4168b8e8287168b39249d930d15ac506bc25 100644 (file)
--- a/db/frag.c
+++ b/db/frag.c
@@ -258,7 +258,7 @@ process_btinode(
        pp = XFS_BMDR_PTR_ADDR(dib, 1,
                xfs_bmdr_maxrecs(XFS_DFORK_SIZE(dip, mp, whichfork), 0));
        for (i = 0; i < be16_to_cpu(dib->bb_numrecs); i++)
-               scan_lbtree(be64_to_cpu(pp[i]), be16_to_cpu(dib->bb_level), 
+               scan_lbtree(be64_to_cpu(pp[i]), be16_to_cpu(dib->bb_level),
                        scanfunc_bmap, extmapp,
                        whichfork == XFS_DATA_FORK ? TYP_BMAPBTD : TYP_BMAPBTA);
 }
@@ -377,7 +377,7 @@ scan_ag(
                pop_cur();
                return;
        }
-       scan_sbtree(agf, be32_to_cpu(agi->agi_root), 
+       scan_sbtree(agf, be32_to_cpu(agi->agi_root),
                        be32_to_cpu(agi->agi_level), scanfunc_ino, TYP_INOBT);
        pop_cur();
        pop_cur();
@@ -457,7 +457,7 @@ scanfunc_bmap(
        }
        pp = XFS_BMBT_PTR_ADDR(mp, block, 1, mp->m_bmap_dmxr[0]);
        for (i = 0; i < nrecs; i++)
-               scan_lbtree(be64_to_cpu(pp[i]), level, scanfunc_bmap, extmapp, 
+               scan_lbtree(be64_to_cpu(pp[i]), level, scanfunc_bmap, extmapp,
                                                                        btype);
 }
 
@@ -495,7 +495,7 @@ scanfunc_ino(
                                if (XFS_INOBT_IS_FREE_DISK(&rp[i], j))
                                        continue;
                                process_inode(agf, agino + j, (xfs_dinode_t *)
-                                       ((char *)iocur_top->data + 
+                                       ((char *)iocur_top->data +
                                        ((off + j) << mp->m_sb.sb_inodelog)));
                        }
                        pop_cur();
@@ -504,6 +504,6 @@ scanfunc_ino(
        }
        pp = XFS_INOBT_PTR_ADDR(mp, block, 1, mp->m_inobt_mxr[1]);
        for (i = 0; i < be16_to_cpu(block->bb_numrecs); i++)
-               scan_sbtree(agf, be32_to_cpu(pp[i]), level, scanfunc_ino, 
+               scan_sbtree(agf, be32_to_cpu(pp[i]), level, scanfunc_ino,
                                                                TYP_INOBT);
 }

diff --git a/db/inode.c b/db/inode.c
index 64b263bd1a8b9298dac09c2755b2471f278c494a..442e6eaeb92f6debb3cd72fbc8b1f0ecea97d9cb 100644 (file)
--- a/db/inode.c
+++ b/db/inode.c
@@ -337,7 +337,7 @@ inode_a_size(
                asf = (xfs_attr_shortform_t *)XFS_DFORK_APTR(dip);
                return bitize(be16_to_cpu(asf->hdr.totsize));
        case XFS_DINODE_FMT_EXTENTS:
-               return (int)be16_to_cpu(dip->di_anextents) * 
+               return (int)be16_to_cpu(dip->di_anextents) *
                                                        bitsz(xfs_bmbt_rec_t);
        case XFS_DINODE_FMT_BTREE:
                return bitize((int)XFS_DFORK_ASIZE(dip, mp));
@@ -595,7 +595,7 @@ inode_u_size(
        case XFS_DINODE_FMT_LOCAL:
                return bitize((int)be64_to_cpu(dip->di_size));
        case XFS_DINODE_FMT_EXTENTS:
-               return (int)be32_to_cpu(dip->di_nextents) * 
+               return (int)be32_to_cpu(dip->di_nextents) *
                                                bitsz(xfs_bmbt_rec_t);
        case XFS_DINODE_FMT_BTREE:
                return bitize((int)XFS_DFORK_DSIZE(dip, mp));

diff --git a/db/input.c b/db/input.c
index a90de6c47c1f32c5a44c882e0e92a186c88ea0ff..8f65190333b65b406429f3608df905bbca0d3840 100644 (file)
--- a/db/input.c
+++ b/db/input.c
@@ -238,11 +238,11 @@ fetchline(void)
 static char *el_get_prompt(EditLine *e) { return get_prompt(); }
 char *
 fetchline(void)
-{     
+{
        static EditLine *el;
        static History  *hist;
        HistEvent       hevent;
-       char            *line;    
+       char            *line;
        int             count;
 
        if (!el) {

diff --git a/db/sb.c b/db/sb.c
index ee3927dd262695b0d63321535d4d6a9d9ef3bac2..79a3c1d42b04549012ec035e44d3e82ab081c9fa 100644 (file)
--- a/db/sb.c
+++ b/db/sb.c
@@ -414,7 +414,7 @@ uuid_f(
                        /* Not set; nothing to do.  Success! */
                        if (!xfs_sb_version_hasmetauuid(&tsb))
                                return 0;
-               
+
                        memcpy(&uu, mp->m_sb.sb_meta_uuid, sizeof(uuid_t));
                } else {
                        if (platform_uuid_parse(argv[1], &uu)) {

diff --git a/db/symlink.c b/db/symlink.c
index ce96556210420dd6706a246df7f47b61aec9d00d..c99b8cae7202e375099fc1b99fc00117842231c3 100644 (file)
--- a/db/symlink.c
+++ b/db/symlink.c
@@ -78,4 +78,3 @@ const struct field    symlink_crc_flds[] = {
                symlink_count, FLD_COUNT, TYP_NONE },
        { NULL }
 };
-

diff --git a/include/atomic.h b/include/atomic.h
index 151c5bf71c3d2236acace0b83aadb9cc9da37ab7..eb23467a6d3735c7c0c474ee1e0760b7ee236287 100644 (file)
--- a/include/atomic.h
+++ b/include/atomic.h
@@ -34,4 +34,3 @@ typedef       int64_t atomic64_t;
 #define atomic64_set(x, v)     (*(x) = v)
 
 #endif /* __ATOMIC_H__ */
-

diff --git a/include/builddefs.in b/include/builddefs.in
index c1797fd2e26a75554651c6a1c16b313a987578e4..b5ce336aa990b37f068bd2aca4b61c79f4ceebb9 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -109,7 +109,7 @@ HAVE_FLS = @have_fls@
 HAVE_FSETXATTR = @have_fsetxattr@
 HAVE_MREMAP = @have_mremap@
 
-GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall 
+GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall
 #         -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-decl
 
 ifeq ($(PKG_PLATFORM),linux)

diff --git a/include/install-sh b/include/install-sh
index c952a7151ab7a2dad706cebb4274e2839f48e66c..9fa706d9a02e8972c8cde59f7e6fa8c09f4b6f56 100755 (executable)
--- a/include/install-sh
+++ b/include/install-sh
@@ -56,7 +56,7 @@ _chown ()
                    fi
                fi
               _st=0
-           fi     
+           fi
        fi
     fi
 
@@ -65,7 +65,7 @@ _chown ()
 
 
 _manifest ()
-{ 
+{
     echo $* | sed -e 's/\/\//\//g' >>${DIST_MANIFEST:-/dev/null}
 }
 
@@ -116,14 +116,14 @@ do
        DIRMODE=`expr $OPTARG`
        FILEMODE=$DIRMODE
        ;;
-   D) 
+   D)
        Dflag=true
        ;;
-   S) 
+   S)
        symlink=$OPTARG
        Sflag=true
        ;;
-   d) 
+   d)
        dir=$DIST_ROOT/$OPTARG
        dflag=true
        ;;
@@ -145,7 +145,7 @@ then
     #
     # first usage
     #
-    $MKDIR -p $dir 
+    $MKDIR -p $dir
     status=$?
     if [ $status -eq 0 ]
     then
@@ -171,7 +171,7 @@ then
     fi
     $LN -s -f $symlink $target
     status=$?
-    $MANIFEST l $symlink ${target#$DIST_ROOT} 
+    $MANIFEST l $symlink ${target#$DIST_ROOT}
 elif $Tflag
 then
     #
@@ -289,7 +289,7 @@ else
        $CP $f $dir
        status=$?
        if [ $status -eq 0 ]
-       then 
+       then
            if [ -f $dir/$f ]
            then
                $CHMOD $FILEMODE $dir/$f

diff --git a/include/kmem.h b/include/kmem.h
index 1893b6909ab27ee03202d7c937f928a1e82bf272..5484d32ab741e6b2d3795480dc540082a7f6ac6e 100644 (file)
--- a/include/kmem.h
+++ b/include/kmem.h
@@ -44,7 +44,7 @@ kmem_zone_free(kmem_zone_t *zone, void *ptr)
 extern void    *kmem_alloc(size_t, int);
 extern void    *kmem_zalloc(size_t, int);
 
-static inline void 
+static inline void
 kmem_free(void *ptr) {
        free(ptr);
 }

diff --git a/include/libxlog.h b/include/libxlog.h
index 6c6e83a6f3c3f34803f025256440668994844dfc..0a11ec803ee9c1f3edfe7cf448a1d5547fccedd1 100644 (file)
--- a/include/libxlog.h
+++ b/include/libxlog.h
@@ -95,7 +95,7 @@ extern int    xlog_bread_noalign(struct xlog *log, xfs_daddr_t blk_no,
 
 extern int     xlog_find_zeroed(struct xlog *log, xfs_daddr_t *blk_no);
 extern int     xlog_find_cycle_start(struct xlog *log, xfs_buf_t *bp,
-                               xfs_daddr_t first_blk, xfs_daddr_t *last_blk, 
+                               xfs_daddr_t first_blk, xfs_daddr_t *last_blk,
                                uint cycle);
 extern int     xlog_find_tail(struct xlog *log, xfs_daddr_t *head_blk,
                                xfs_daddr_t *tail_blk);
@@ -115,7 +115,7 @@ extern int  xlog_do_recovery_pass(struct xlog *log, xfs_daddr_t head_blk,
                                xfs_daddr_t tail_blk, int pass);
 extern int     xlog_recover_do_trans(struct xlog *log, xlog_recover_t *trans,
                                int pass);
-extern int     xlog_header_check_recover(xfs_mount_t *mp, 
+extern int     xlog_header_check_recover(xfs_mount_t *mp,
                                xlog_rec_header_t *head);
 extern int     xlog_header_check_mount(xfs_mount_t *mp,
                                xlog_rec_header_t *head);

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index 67f3b05cdfe7d53f282169cfabadc58578b15431..14b05a6d0f3cbf959fde8953cade2a96ebf9b7e6 100644 (file)
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -153,4 +153,3 @@ extern void libxfs_umount (xfs_mount_t *);
 extern void    libxfs_rtmount_destroy (xfs_mount_t *);
 
 #endif /* __XFS_MOUNT_H__ */
-

diff --git a/io/fiemap.c b/io/fiemap.c
index 17b38a4fe528a0ebf145839904241881de17d3a9..f89da068e3258f411fbd12ae416a747ceb161485 100644 (file)
--- a/io/fiemap.c
+++ b/io/fiemap.c
@@ -298,7 +298,7 @@ fiemap_f(
                                                          &foff_w, &boff_w,
                                                          &tot_w, &flg_w);
                                }
-                                       
+
                                print_verbose(extent, blocksize, foff_w,
                                              boff_w, tot_w, flg_w,
                                              max_extents, &cur_extent,

diff --git a/io/mmap.c b/io/mmap.c
index 7093650ace9f86c80567075e911b7b025deef4ac..5970069cb86bb9ca4b2e216013ef1b3d85b76387 100644 (file)
--- a/io/mmap.c
+++ b/io/mmap.c
@@ -166,7 +166,7 @@ mmap_f(
                if (mapping)
                        return maplist_f();
                fprintf(stderr, file ?
-                       _("no mapped regions, try 'help mmap'\n") : 
+                       _("no mapped regions, try 'help mmap'\n") :
                        _("no files are open, try 'help open'\n"));
                return 0;
        } else if (argc == 2) {

diff --git a/io/parent.c b/io/parent.c
index abc3402b36aa18d090b8f8372dd4699dbcc7276a..1968516d2c008a4d72ffb2b78f044206fb790d07 100644 (file)
--- a/io/parent.c
+++ b/io/parent.c
@@ -141,7 +141,7 @@ check_parents(parent_t *parentbuf, size_t *parentbuf_size,
                        break;
                }
        } while (error == ERANGE);
-       
+
 
        if (count == 0) {
                /* no links for inode - something wrong here */

diff --git a/libhandle/handle.c b/libhandle/handle.c
index 7207186b19f32112fea4e17c731e3e81342b0d64..236ed22adc129e3236e7dea45bef45b2cb327867 100644 (file)
--- a/libhandle/handle.c
+++ b/libhandle/handle.c
@@ -413,7 +413,7 @@ parents_by_handle(
        parent_t        *buf,
        size_t          bufsiz,
        unsigned int    *count)
-       
+
 {
        errno = EOPNOTSUPP;
        return -1;

diff --git a/libxcmd/paths.c b/libxcmd/paths.c
index 5c65737a50de89f29727c59f1831831a71a4a4d9..71af25f2bb9f75cab0c7c6972954f3bc6dd60b4d 100644 (file)
--- a/libxcmd/paths.c
+++ b/libxcmd/paths.c
@@ -515,7 +515,7 @@ out_error:
                progname, strerror(error));
 }
 
-void 
+void
 fs_table_insert_project_path(
        char            *dir,
        prid_t          prid)
@@ -536,4 +536,3 @@ fs_table_insert_project_path(
                exit(1);
        }
 }
-

diff --git a/libxfs/Makefile b/libxfs/Makefile
index ecf1921f7a74f10f2ae876bcbfe9896c438b8210..ca1a5ee181bbdde76959e557d255f77cb1abc8ec 100644 (file)
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -148,4 +148,3 @@ install-dev: install
 ifndef NODEP
 -include .ltdep
 endif
-

diff --git a/libxfs/darwin.c b/libxfs/darwin.c
index b9c314ffa8afaa83ff23fefdcad29329bea04490..017e190f159ca1e922dd6baeb9ee229769fbc1a5 100644 (file)
--- a/libxfs/darwin.c
+++ b/libxfs/darwin.c
@@ -142,4 +142,3 @@ platform_physmem(void)
        }
        return physmem >> 10;
 }
-

diff --git a/libxfs/init.c b/libxfs/init.c
index c7f9dc8bd9e62af4eba63e9449b20f9f0d660d0b..8d747e810d9d9c77f48a48fdbaf189f9315de00e 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -840,7 +840,7 @@ libxfs_umount(xfs_mount_t *mp)
        if (mp->m_logdev_targp != mp->m_ddev_targp)
                kmem_free(mp->m_logdev_targp);
        kmem_free(mp->m_ddev_targp);
-       
+
 }
 
 /*

diff --git a/libxfs/kmem.c b/libxfs/kmem.c
index 6421304b08448ff4e256f8b44a754f4d67ce162b..4f3cd7e2fd0e9451b753ee7ebf5618523e024d5e 100644 (file)
--- a/libxfs/kmem.c
+++ b/libxfs/kmem.c
@@ -13,7 +13,7 @@ kmem_zone_init(int size, char *name)
 
        if (ptr == NULL) {
                fprintf(stderr, _("%s: zone init failed (%s, %d bytes): %s\n"),
-                       progname, name, (int)sizeof(kmem_zone_t), 
+                       progname, name, (int)sizeof(kmem_zone_t),
                        strerror(errno));
                exit(1);
        }
@@ -80,4 +80,3 @@ kmem_realloc(void *ptr, size_t new_size, size_t old_size, int flags)
        }
        return ptr;
 }
-

diff --git a/libxfs/util.c b/libxfs/util.c
index 0609ba41feac1da8daa2bd01ca869fb1c24494e2..90031fd74dedc3ff26ec73976cc1b84588a4fdcb 100644 (file)
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -359,7 +359,7 @@ libxfs_iprint(
                (unsigned long)ip->i_df.if_u1.if_extents);
        if (ip->i_df.if_flags & XFS_IFEXTENTS) {
                nextents = ip->i_df.if_bytes / (uint)sizeof(*ep);
-               for (ep = ip->i_df.if_u1.if_extents, i = 0; i < nextents; 
+               for (ep = ip->i_df.if_u1.if_extents, i = 0; i < nextents;
                                                                i++, ep++) {
                        xfs_bmbt_irec_t rec;
 
@@ -453,7 +453,7 @@ libxfs_iflush_int(xfs_inode_t *ip, xfs_buf_t *bp)
        xfs_dinode_to_disk(dip, &ip->i_d);
 
        xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK);
-       if (XFS_IFORK_Q(ip)) 
+       if (XFS_IFORK_Q(ip))
                xfs_iflush_fork(ip, dip, iip, XFS_ATTR_FORK);
 
        /* update the lsn in the on disk inode if required */

diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 1186cacb8bebf84892ee89d5c91b5d3f33bc6d78..d0eb0a70433f5b6fb62931fcbb1339b5f4837f3a 100644 (file)
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -421,7 +421,7 @@ xfs_attr_shortform_bytesfit(xfs_inode_t *dp, int bytes)
        switch (dp->i_d.di_format) {
        case XFS_DINODE_FMT_EXTENTS:
                /*
-                * If there is no attr fork and the data fork is extents, 
+                * If there is no attr fork and the data fork is extents,
                 * determine if creating the default attr fork will result
                 * in the extents form migrating to btree. If so, the
                 * minimum offset only needs to be the space required for

diff --git a/libxfs/xfs_dquot_buf.c b/libxfs/xfs_dquot_buf.c
index 38f9703833f4c458e765249f5a4c7fbbea7ee4f0..fd4aa4bbdc9547666d0dcba2e147fb001017c94a 100644 (file)
--- a/libxfs/xfs_dquot_buf.c
+++ b/libxfs/xfs_dquot_buf.c
@@ -294,4 +294,3 @@ const struct xfs_buf_ops xfs_dquot_buf_ops = {
        .verify_read = xfs_dquot_buf_read_verify,
        .verify_write = xfs_dquot_buf_write_verify,
 };
-

diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index 946bcd16476511448a3119b2f96a661b09de8073..c0e1b7090d3a3cd4c05a9d5c232fab4a4fad1eae 100644 (file)
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -21,7 +21,7 @@
 /*
  * XFS On Disk Format Definitions
  *
- * This header file defines all the on-disk format definitions for 
+ * This header file defines all the on-disk format definitions for
  * general XFS objects. Directory and attribute related objects are defined in
  * xfs_da_format.h, which log and log item formats are defined in
  * xfs_log_format.h. Everything else goes here.

diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index 5039f4b7993830b0e975ac6e576fa0c514cba3df..c60b8d3735ae0a7ef4e0317b152502737c8120a8 100644 (file)
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -1982,7 +1982,7 @@ xfs_difree_inobt(
                        goto error0;
                }
 
-               /* 
+               /*
                 * Change the inode free counts and log the ag/sb changes.
                 */
                be32_add_cpu(&agi->agi_freecount, 1);

diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
index 0054432c17329f7ac631a363287d98ea3d495a4e..5648ea51e63b69d1f6f5f8fec88868f9b04a3429 100644 (file)
--- a/libxfs/xfs_rtbitmap.c
+++ b/libxfs/xfs_rtbitmap.c
@@ -983,4 +983,3 @@ xfs_rtfree_extent(
        }
        return 0;
 }
-

diff --git a/libxfs/xfs_trans_resv.c b/libxfs/xfs_trans_resv.c
index 0c40b528de2b059fa4c69bd53463ec5191280dc8..9e519a5d084978f43c8dcc2310ae67562bcdc6a7 100644 (file)
--- a/libxfs/xfs_trans_resv.c
+++ b/libxfs/xfs_trans_resv.c
@@ -136,7 +136,7 @@ xfs_calc_finobt_res(
 
        res = xfs_calc_buf_res(mp->m_in_maxlevels, XFS_FSB_TO_B(mp, 1));
        if (alloc)
-               res += xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1), 
+               res += xfs_calc_buf_res(XFS_ALLOCFREE_LOG_COUNT(mp, 1),
                                        XFS_FSB_TO_B(mp, 1));
        if (modify)
                res += (uint)XFS_FSB_TO_B(mp, 1);

diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c
index 9f1a7abf305265813337048b602356a1af39b449..ba2640880d53236deb2a22888ebef5e8002e3757 100644 (file)
--- a/logprint/log_print_all.c
+++ b/logprint/log_print_all.c
@@ -104,7 +104,7 @@ xlog_recover_print_buffer(
                i++;
                if (blkno == 0) { /* super block */
                        printf(_("      SUPER Block Buffer:\n"));
-                       if (!print_buffer) 
+                       if (!print_buffer)
                                continue;
                       printf(_("              icount:%llu ifree:%llu  "),
                               (unsigned long long)
@@ -123,7 +123,7 @@ xlog_recover_print_buffer(
                        int bucket, buckets;
                        agi = (xfs_agi_t *)p;
                        printf(_("      AGI Buffer: (XAGI)\n"));
-                       if (!print_buffer) 
+                       if (!print_buffer)
                                continue;
                        printf(_("              ver:%d  "),
                                be32_to_cpu(agi->agi_versionnum));
@@ -157,7 +157,7 @@ xlog_recover_print_buffer(
                } else if (be32_to_cpu(*(__be32 *)p) == XFS_AGF_MAGIC) {
                        agf = (xfs_agf_t *)p;
                        printf(_("      AGF Buffer: (XAGF)\n"));
-                       if (!print_buffer) 
+                       if (!print_buffer)
                                continue;
                        printf(_("              ver:%d  seq#:%d  len:%d  \n"),
                                be32_to_cpu(agf->agf_versionnum),
@@ -179,7 +179,7 @@ xlog_recover_print_buffer(
                } else if (*(uint *)p == XFS_DQUOT_MAGIC) {
                        ddq = (xfs_disk_dquot_t *)p;
                        printf(_("      DQUOT Buffer:\n"));
-                       if (!print_buffer) 
+                       if (!print_buffer)
                                continue;
                        printf(_("              UIDs 0x%lx-0x%lx\n"),
                               (unsigned long)be32_to_cpu(ddq->d_id),

diff --git a/m4/manual_format.m4 b/m4/manual_format.m4
index 50c6a91480ab9661b42e1fb45779194f7ccacd52..fa9362f9208e380629ba5c1f07cf3d095aae69c4 100644 (file)
--- a/m4/manual_format.m4
+++ b/m4/manual_format.m4
@@ -3,7 +3,7 @@
 # Always gzipped on Debian, but not Redhat pre-7.0.
 # We don't deal with bzip2'd man pages, which Mandrake uses,
 # someone will send us a patch sometime hopefully. :-)
-# 
+#
 AC_DEFUN([AC_MANUAL_FORMAT],
   [ have_zipped_manpages=false
     for d in ${prefix}/share/man ${prefix}/man ; do

diff --git a/m4/package_aiodev.m4 b/m4/package_aiodev.m4
index 490d9c82a3fa1d0a81599ee84f32b941b4c52479..5510d1538910f66f2afdd23dca794aa69cbd6f0e 100644 (file)
--- a/m4/package_aiodev.m4
+++ b/m4/package_aiodev.m4
@@ -34,4 +34,3 @@ AC_DEFUN([AC_PACKAGE_NEED_LIO_LISTIO],
     fi
     AC_SUBST(librt)
   ])
-

diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index b6a7a5457c78e5863b702effb75be3bf9401d970..016531076afd31c762fd049acd2a7b59ecc1dd51 100644 (file)
--- a/m4/package_libcdev.m4
+++ b/m4/package_libcdev.m4
@@ -1,6 +1,6 @@
 # 
 # Check if we have a working fadvise system call
-# 
+#
 AC_DEFUN([AC_HAVE_FADVISE],
   [ AC_MSG_CHECKING([for fadvise ])
     AC_TRY_COMPILE([
@@ -15,9 +15,9 @@ AC_DEFUN([AC_HAVE_FADVISE],
     AC_SUBST(have_fadvise)
   ])
 
-# 
+#
 # Check if we have a working madvise system call
-# 
+#
 AC_DEFUN([AC_HAVE_MADVISE],
   [ AC_MSG_CHECKING([for madvise ])
     AC_TRY_COMPILE([
@@ -32,9 +32,9 @@ AC_DEFUN([AC_HAVE_MADVISE],
     AC_SUBST(have_madvise)
   ])
 
-# 
+#
 # Check if we have a working mincore system call
-# 
+#
 AC_DEFUN([AC_HAVE_MINCORE],
   [ AC_MSG_CHECKING([for mincore ])
     AC_TRY_COMPILE([
@@ -49,9 +49,9 @@ AC_DEFUN([AC_HAVE_MINCORE],
     AC_SUBST(have_mincore)
   ])
 
-# 
+#
 # Check if we have a working sendfile system call
-# 
+#
 AC_DEFUN([AC_HAVE_SENDFILE],
   [ AC_MSG_CHECKING([for sendfile ])
     AC_TRY_COMPILE([

diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index 5764616f970df186c8cc45ccf06651fc4a46c1e0..ebc5e544df74db39b2f5ecaf39da682d7374afd8 100644 (file)
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -156,7 +156,7 @@ perform_restore(
                if (mb_count > max_indicies)
                        fatal("bad block count: %u\n", mb_count);
 
-               if (fread(block_buffer, mb_count << tmb.mb_blocklog, 
+               if (fread(block_buffer, mb_count << tmb.mb_blocklog,
                                                                1, src_f) != 1)
                        fatal("error reading from file: %s\n", strerror(errno));
 

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index b86d5be12efb92a0ce89e388e65b4cc0044ab2a7..700d12c85d61399bb2cb54051138546f4729ce1b 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -430,7 +430,7 @@ static void blkid_get_topology(
         * terms of 512 bytes blocks (only to convert it to bytes later..)
         */
        *sunit = *sunit >> 9;
-       *swidth = *swidth >> 9; 
+       *swidth = *swidth >> 9;
 
        if (blkid_topology_get_alignment_offset(tp) != 0) {
                fprintf(stderr,
@@ -2880,7 +2880,7 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"),
                 * so, reset the record count to 0 to avoid exposure of an invalid
                 * record start block.
                 */
-               arec->ar_blockcount = cpu_to_be32(agsize - 
+               arec->ar_blockcount = cpu_to_be32(agsize -
                                        be32_to_cpu(arec->ar_startblock));
                if (!arec->ar_blockcount)
                        block->bb_numrecs = 0;
@@ -2925,7 +2925,7 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"),
                 * so, reset the record count to 0 to avoid exposure of an invalid
                 * record start block.
                 */
-               arec->ar_blockcount = cpu_to_be32(agsize - 
+               arec->ar_blockcount = cpu_to_be32(agsize -
                                        be32_to_cpu(arec->ar_startblock));
                if (!arec->ar_blockcount)
                        block->bb_numrecs = 0;

diff --git a/quota/edit.c b/quota/edit.c
index d226e89b610df96a546b1fdc35d4b955bfbc6f31..c55fa1a67114e30221de31c1379cc22a2dace43b 100644 (file)
--- a/quota/edit.c
+++ b/quota/edit.c
@@ -122,7 +122,7 @@ set_limits(
        __uint64_t      *bsoft,
        __uint64_t      *bhard,
        __uint64_t      *isoft,
-       __uint64_t      *ihard, 
+       __uint64_t      *ihard,
        __uint64_t      *rtbsoft,
        __uint64_t      *rtbhard)
 {
@@ -155,7 +155,7 @@ set_user_limits(
        __uint64_t      *bsoft,
        __uint64_t      *bhard,
        __uint64_t      *isoft,
-       __uint64_t      *ihard, 
+       __uint64_t      *ihard,
        __uint64_t      *rtbsoft,
        __uint64_t      *rtbhard)
 {
@@ -178,7 +178,7 @@ set_group_limits(
        __uint64_t      *bsoft,
        __uint64_t      *bhard,
        __uint64_t      *isoft,
-       __uint64_t      *ihard, 
+       __uint64_t      *ihard,
        __uint64_t      *rtbsoft,
        __uint64_t      *rtbhard)
 {
@@ -201,7 +201,7 @@ set_project_limits(
        __uint64_t      *bsoft,
        __uint64_t      *bhard,
        __uint64_t      *isoft,
-       __uint64_t      *ihard, 
+       __uint64_t      *ihard,
        __uint64_t      *rtbsoft,
        __uint64_t      *rtbhard)
 {

diff --git a/quota/quota.h b/quota/quota.h
index a905ce5694880d3cb66d071457bcf2f21b06452f..416f335f9bf03776e71b59e299315ba0e8ce9e6e 100644 (file)
--- a/quota/quota.h
+++ b/quota/quota.h
@@ -82,4 +82,3 @@ 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 *);
-

diff --git a/quota/state.c b/quota/state.c
index 0173f408fa46a1daea39e721014368a8ab4d40aa..81867621cdda2335f723e2f70d5bca2a1fd54547 100644 (file)
--- a/quota/state.c
+++ b/quota/state.c
@@ -339,14 +339,14 @@ remove_extents(
        }
        dir = mount->fs_name;
        if (type & XFS_USER_QUOTA) {
-               if (remove_qtype_extents(dir, XFS_USER_QUOTA) < 0) 
+               if (remove_qtype_extents(dir, XFS_USER_QUOTA) < 0)
                        return;
        }
        if (type & XFS_GROUP_QUOTA) {
-               if (remove_qtype_extents(dir, XFS_GROUP_QUOTA) < 0) 
+               if (remove_qtype_extents(dir, XFS_GROUP_QUOTA) < 0)
                        return;
        } else if (type & XFS_PROJ_QUOTA) {
-               if (remove_qtype_extents(dir, XFS_PROJ_QUOTA) < 0) 
+               if (remove_qtype_extents(dir, XFS_PROJ_QUOTA) < 0)
                        return;
        }
        if (flags & VERBOSE_FLAG)

diff --git a/repair/agheader.c b/repair/agheader.c
index 5e4b06666512415fec544a9c08e0f5e95ca5f885..bd11ac2bd72bbfafb7a73f27e49b46f20b439252 100644 (file)
--- a/repair/agheader.c
+++ b/repair/agheader.c
@@ -69,7 +69,7 @@ verify_set_agf(xfs_mount_t *mp, xfs_agf_t *agf, xfs_agnumber_t i)
                                be32_to_cpu(agf->agf_length), i,
                                mp->m_sb.sb_agblocks);
                        if (!no_modify)
-                               agf->agf_length = 
+                               agf->agf_length =
                                        cpu_to_be32(mp->m_sb.sb_agblocks);
                } else  {
                        agblocks = mp->m_sb.sb_dblocks -
@@ -168,7 +168,7 @@ verify_set_agi(xfs_mount_t *mp, xfs_agi_t *agi, xfs_agnumber_t agno)
                                be32_to_cpu(agi->agi_length), agno,
                                        mp->m_sb.sb_agblocks);
                        if (!no_modify)
-                               agi->agi_length = 
+                               agi->agi_length =
                                        cpu_to_be32(mp->m_sb.sb_agblocks);
                } else  {
                        agblocks = mp->m_sb.sb_dblocks -

diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index da2800db4df19efc44de0752da9db2e08d78eb5a..40cb5f7f754d82abe67bc88c084d6997e99f4ab8 100644 (file)
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -243,7 +243,7 @@ process_shortform_attr(
                                do_warn(
        _("there are no attributes in the fork for inode %" PRIu64 "\n"),
                                        ino);
-                               asf->hdr.totsize = 
+                               asf->hdr.totsize =
                                        cpu_to_be16(sizeof(xfs_attr_sf_hdr_t));
                                *repair = 1;
                                return(1);
@@ -325,7 +325,7 @@ process_shortform_attr(
                if (currententry->flags & XFS_ATTR_ROOT)
                       junkit |= valuecheck(mp,
                                        (char *)&currententry->nameval[0],
-                                       NULL, currententry->namelen, 
+                                       NULL, currententry->namelen,
                                        currententry->valuelen);
 
                remainingspace = remainingspace -
@@ -470,7 +470,7 @@ process_leaf_attr_local(
        xfs_attr_leaf_name_local_t *local;
 
        local = xfs_attr3_leaf_name_local(leaf, i);
-       if (local->namelen == 0 || namecheck((char *)&local->nameval[0], 
+       if (local->namelen == 0 || namecheck((char *)&local->nameval[0],
                                                        local->namelen)) {
                do_warn(
        _("attribute entry %d in attr block %u, inode %" PRIu64 " has bad name (namelen = %d)\n"),
@@ -497,7 +497,7 @@ process_leaf_attr_local(
 
        /* Only check values for root security attributes */
        if (entry->flags & XFS_ATTR_ROOT) {
-               if (valuecheck(mp, (char *)&local->nameval[0], NULL, 
+               if (valuecheck(mp, (char *)&local->nameval[0], NULL,
                                local->namelen, be16_to_cpu(local->valuelen))) {
                        do_warn(
        _("bad security value for attribute entry %d in attr block %u, inode %" PRIu64 "\n"),
@@ -505,7 +505,7 @@ process_leaf_attr_local(
                        return -1;
                }
        }
-       return xfs_attr_leaf_entsize_local(local->namelen, 
+       return xfs_attr_leaf_entsize_local(local->namelen,
                                                be16_to_cpu(local->valuelen));
 }
 
@@ -525,10 +525,10 @@ process_leaf_attr_remote(
 
        remotep = xfs_attr3_leaf_name_remote(leaf, i);
 
-       if (remotep->namelen == 0 || namecheck((char *)&remotep->name[0], 
-                                               remotep->namelen) || 
-                       be32_to_cpu(entry->hashval) != 
-                               libxfs_da_hashname((unsigned char *)&remotep->name[0], 
+       if (remotep->namelen == 0 || namecheck((char *)&remotep->name[0],
+                                               remotep->namelen) ||
+                       be32_to_cpu(entry->hashval) !=
+                               libxfs_da_hashname((unsigned char *)&remotep->name[0],
                                                remotep->namelen) ||
                        be32_to_cpu(entry->hashval) < last_hashval ||
                        be32_to_cpu(remotep->valueblk) == 0) {
@@ -539,7 +539,7 @@ process_leaf_attr_remote(
 
        if (!(entry->flags & XFS_ATTR_ROOT))
                goto out;
- 
+
        value = malloc(be32_to_cpu(remotep->valuelen));
        if (value == NULL) {
                do_warn(
@@ -673,14 +673,14 @@ process_leaf_attr_block(
                 * since the block will get compacted anyhow by the kernel.
                 */
 
-               if ((leafhdr.holes == 0 && 
+               if ((leafhdr.holes == 0 &&
                                firstb != leafhdr.firstused) ||
                                leafhdr.firstused > firstb)  {
                        if (!no_modify)  {
                                do_warn(
        _("- resetting first used heap value from %d to %d in "
          "block %u of attribute fork of inode %" PRIu64 "\n"),
-                                       leafhdr.firstused, 
+                                       leafhdr.firstused,
                                        firstb, da_bno, ino);
                                leafhdr.firstused = firstb;
                                *repair = 1;
@@ -688,7 +688,7 @@ process_leaf_attr_block(
                                do_warn(
        _("- would reset first used value from %d to %d in "
          "block %u of attribute fork of inode %" PRIu64 "\n"),
-                                       leafhdr.firstused, 
+                                       leafhdr.firstused,
                                        firstb, da_bno, ino);
                        }
                }
@@ -698,7 +698,7 @@ process_leaf_attr_block(
                                do_warn(
        _("- resetting usedbytes cnt from %d to %d in "
          "block %u of attribute fork of inode %" PRIu64 "\n"),
-                                       leafhdr.usedbytes, 
+                                       leafhdr.usedbytes,
                                        usedbs, da_bno, ino);
                                leafhdr.usedbytes = usedbs;
                                *repair = 1;
@@ -706,7 +706,7 @@ process_leaf_attr_block(
                                do_warn(
        _("- would reset usedbytes cnt from %d to %d in "
          "block %u of attribute fork of %" PRIu64 "\n"),
-                                       leafhdr.usedbytes, 
+                                       leafhdr.usedbytes,
                                        usedbs, da_bno, ino);
                        }
                }
@@ -988,7 +988,7 @@ process_longform_attr(
        bno = blkmap_get(blkmap, 0);
 
        if ( bno == NULLFSBLOCK ) {
-               if (dip->di_aformat == XFS_DINODE_FMT_EXTENTS && 
+               if (dip->di_aformat == XFS_DINODE_FMT_EXTENTS &&
                                be16_to_cpu(dip->di_anextents) == 0)
                        return(0); /* the kernel can handle this state */
                do_warn(

diff --git a/repair/da_util.c b/repair/da_util.c
index 89d41cccb95c04abd20e8d44ecea15e4fc5286d5..a65652fa9798436ae7214f21ad5c552fb4e37648 100644 (file)
--- a/repair/da_util.c
+++ b/repair/da_util.c
@@ -386,7 +386,7 @@ _("bad %s forward block pointer, expected 0, saw %u\n"),
        }
        /*
         * keep track of greatest block # -- that gets
-        * us the length of the directory/attribute 
+        * us the length of the directory/attribute
         */
        if (cursor->level[this_level].bno > cursor->greatest_bno)
                cursor->greatest_bno = cursor->level[this_level].bno;

diff --git a/repair/dinode.c b/repair/dinode.c
index 43142d6ae447753e642a7af1d5f9611a89b4ec09..3fec9f40e8509d75d03c6b398cdf07906531ad3f 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -288,9 +288,9 @@ verify_ag_bno(xfs_sb_t *sbp,
                xfs_agnumber_t agno,
                xfs_agblock_t agbno)
 {
-       if (agno < (sbp->sb_agcount - 1)) 
+       if (agno < (sbp->sb_agcount - 1))
                return (agbno >= sbp->sb_agblocks);
-       if (agno == (sbp->sb_agcount - 1)) 
+       if (agno == (sbp->sb_agcount - 1))
                return (agbno >= (sbp->sb_dblocks -
                                ((xfs_rfsblock_t)(sbp->sb_agcount - 1) *
                                 sbp->sb_agblocks)));
@@ -1159,7 +1159,7 @@ process_symlink_extlist(xfs_mount_t *mp, xfs_ino_t lino, xfs_dinode_t *dino)
        int                     max_blocks;
 
        if (be64_to_cpu(dino->di_size) <= XFS_DFORK_DSIZE(dino, mp)) {
-               if (dino->di_format == XFS_DINODE_FMT_LOCAL)  
+               if (dino->di_format == XFS_DINODE_FMT_LOCAL)
                        return 0;
                do_warn(
 _("mismatch between format (%d) and size (%" PRId64 ") in symlink ino %" PRIu64 "\n"),
@@ -1359,7 +1359,7 @@ process_symlink(
                 * local symlink, just copy the symlink out of the
                 * inode into the data area
                 */
-               memmove(symlink, XFS_DFORK_DPTR(dino), 
+               memmove(symlink, XFS_DFORK_DPTR(dino),
                                                be64_to_cpu(dino->di_size));
        } else {
                int error;
@@ -1934,7 +1934,7 @@ process_inode_data_fork(
                 */
                switch (dino->di_format) {
                case XFS_DINODE_FMT_LOCAL:
-                       err = process_lclinode(mp, agno, ino, dino, 
+                       err = process_lclinode(mp, agno, ino, dino,
                                                XFS_DATA_FORK);
                        break;
                case XFS_DINODE_FMT_EXTENTS:
@@ -2068,7 +2068,7 @@ process_inode_attr_fork(
        if (check_dups)  {
                switch (dino->di_aformat) {
                case XFS_DINODE_FMT_LOCAL:
-                       err = process_lclinode(mp, agno, ino, dino, 
+                       err = process_lclinode(mp, agno, ino, dino,
                                                XFS_ATTR_FORK);
                        break;
                case XFS_DINODE_FMT_EXTENTS:

diff --git a/repair/phase5.c b/repair/phase5.c
index 109e37b31dddcaf5bd700cce9cddd92fe5060fb5..5d48848142a51d76f16a3bf34ce6760449eaa240 100644 (file)
--- a/repair/phase5.c
+++ b/repair/phase5.c
@@ -1124,7 +1124,7 @@ build_agi(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs,
        agi->agi_newino = cpu_to_be32(agi_stat->first_agino);
        agi->agi_dirino = cpu_to_be32(NULLAGINO);
 
-       for (i = 0; i < XFS_AGI_UNLINKED_BUCKETS; i++)  
+       for (i = 0; i < XFS_AGI_UNLINKED_BUCKETS; i++)
                agi->agi_unlinked[i] = cpu_to_be32(NULLAGINO);
 
        if (xfs_sb_version_hascrc(&mp->m_sb))

diff --git a/repair/phase6.c b/repair/phase6.c
index e41bf201c486821f0c20ed9e4bcf0374186e0ab2..7680deb540b8d2acdab404d2b38fceb5632c2afa 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1039,7 +1039,7 @@ mk_orphanage(xfs_mount_t *mp)
         */
        error = -libxfs_dir_createname(tp, pip, &xname, ip->i_ino, &first,
                                        &flist, nres);
-       if (error) 
+       if (error)
                do_error(
                _("can't make %s, createname error %d\n"),
                        ORPHANAGE, error);

diff --git a/repair/prefetch.c b/repair/prefetch.c
index b11dcb31d3046bef1ea02fb00515ea606999c733..b4f20d948ea86549fa751e4b65a8319c5984cbea 100644 (file)
--- a/repair/prefetch.c
+++ b/repair/prefetch.c
@@ -945,7 +945,7 @@ prefetch_ag_range_work(
 {
        struct pf_work_args *wargs = args;
 
-       prefetch_ag_range(work, wargs->start_ag, wargs->end_ag, 
+       prefetch_ag_range(work, wargs->start_ag, wargs->end_ag,
                          wargs->dirs_only, wargs->func);
        free(args);
 }

diff --git a/repair/protos.h b/repair/protos.h
index ff42fa76a1af859c14e64df1a403d4eed9532be2..9d5a2a6796a853c22dcaa02bc30cdcf35cef79b2 100644 (file)
--- a/repair/protos.h
+++ b/repair/protos.h
@@ -55,4 +55,3 @@ void  phase7(struct xfs_mount *);
 int    verify_set_agheader(struct xfs_mount *, struct xfs_buf *,
                struct xfs_sb *, struct xfs_agf *, struct xfs_agi *,
                xfs_agnumber_t);
-

diff --git a/repair/scan.c b/repair/scan.c
index 1e7a4da15609eaab28481330b46a7d4bbb0b3b73..964ff0604c43a327d936849451db60f23c66395a 100644 (file)
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -1803,4 +1803,3 @@ scan_ags(
                        mp->m_sb.sb_fdblocks, fdblocks);
        }
 }
-

diff --git a/repair/versions.c b/repair/versions.c
index fb1b3e428a833370506ef4ffc5f1faa7f64c27b8..15853851363adfde25c3ddc73eb78caaa66e5bcc 100644 (file)
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -84,7 +84,7 @@ update_sb_version(xfs_mount_t *mp)
                }
        }
 
-       if (!fs_aligned_inodes && xfs_sb_version_hasalign(sb))  
+       if (!fs_aligned_inodes && xfs_sb_version_hasalign(sb))
                sb->sb_versionnum &= ~XFS_SB_VERSION_ALIGNBIT;
 }
 

diff --git a/tools/libxfs-apply b/tools/libxfs-apply
index 4a8c8a68cbd2f16b63d3c517468cdd5f77c6ab50..8d78d4874b39806315632f5a6ed3ed33cc37b3e9 100755 (executable)
--- a/tools/libxfs-apply
+++ b/tools/libxfs-apply
@@ -17,7 +17,7 @@ usage()
 
 cleanup()
 {
-       rm -f $PATCH 
+       rm -f $PATCH
 }
 
 fail()