hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfs: fix indentation and other whitespace problems in scrub/repair 

Now that we've shortened everything, fix up all the indentation and
whitespace problems.  There are no functional changes.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
This commit is contained in:
Darrick J. Wong 2018-07-19 12:29:12 -07:00
parent 1d8a748a8a
commit 032d91f982
25 changed files with 832 additions and 843 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/scrub/btree.c
View File

@ -490,7 +490,7 @@ xchk_btree_get_block(
struct xfs_btree_block **pblock, struct xfs_btree_block **pblock,
struct xfs_buf **pbp) struct xfs_buf **pbp)
{ {
void *failed_at; xfs_failaddr_t failed_at;
int error; int error;
*pblock = NULL; *pblock = NULL;

7
fs/xfs/scrub/btree.h
View File

@ -14,8 +14,7 @@ bool xchk_btree_process_error(struct xfs_scrub *sc,
/* Check for btree xref operation errors. */ /* Check for btree xref operation errors. */
bool xchk_btree_xref_process_error(struct xfs_scrub *sc, bool xchk_btree_xref_process_error(struct xfs_scrub *sc,
struct xfs_btree_cur *cur, int level, struct xfs_btree_cur *cur, int level, int *error);
int *error);
/* Check for btree corruption. */ /* Check for btree corruption. */
void xchk_btree_set_corrupt(struct xfs_scrub *sc, void xchk_btree_set_corrupt(struct xfs_scrub *sc,
@ -46,7 +45,7 @@ struct xchk_btree {
struct list_head to_check; struct list_head to_check;
}; };
int xchk_btree(struct xfs_scrub *sc, struct xfs_btree_cur *cur, int xchk_btree(struct xfs_scrub *sc, struct xfs_btree_cur *cur,
xchk_btree_rec_fn scrub_fn, xchk_btree_rec_fn scrub_fn, struct xfs_owner_info *oinfo,
struct xfs_owner_info *oinfo, void *private); void *private);
#endif /* __XFS_SCRUB_BTREE_H__ */ #endif /* __XFS_SCRUB_BTREE_H__ */

17
fs/xfs/scrub/common.h
View File

@ -114,18 +114,15 @@ int xchk_ag_read_headers(struct xfs_scrub *sc, xfs_agnumber_t agno,
struct xfs_buf **agi, struct xfs_buf **agf, struct xfs_buf **agi, struct xfs_buf **agf,
struct xfs_buf **agfl); struct xfs_buf **agfl);
void xchk_ag_btcur_free(struct xchk_ag *sa); void xchk_ag_btcur_free(struct xchk_ag *sa);
int xchk_ag_btcur_init(struct xfs_scrub *sc, int xchk_ag_btcur_init(struct xfs_scrub *sc, struct xchk_ag *sa);
struct xchk_ag *sa); int xchk_count_rmap_ownedby_ag(struct xfs_scrub *sc, struct xfs_btree_cur *cur,
int xchk_count_rmap_ownedby_ag(struct xfs_scrub *sc, struct xfs_owner_info *oinfo, xfs_filblks_t *blocks);
struct xfs_btree_cur *cur,
struct xfs_owner_info *oinfo,
xfs_filblks_t *blocks);
int xchk_setup_ag_btree(struct xfs_scrub *sc, int xchk_setup_ag_btree(struct xfs_scrub *sc, struct xfs_inode *ip,
struct xfs_inode *ip, bool force_log); bool force_log);
int xchk_get_inode(struct xfs_scrub *sc, struct xfs_inode *ip_in); int xchk_get_inode(struct xfs_scrub *sc, struct xfs_inode *ip_in);
int xchk_setup_inode_contents(struct xfs_scrub *sc, int xchk_setup_inode_contents(struct xfs_scrub *sc, struct xfs_inode *ip,
struct xfs_inode *ip, unsigned int resblks); unsigned int resblks);
void xchk_buffer_recheck(struct xfs_scrub *sc, struct xfs_buf *bp); void xchk_buffer_recheck(struct xfs_scrub *sc, struct xfs_buf *bp);
/* /*

3
fs/xfs/scrub/dabtree.h
View File

@ -37,8 +37,7 @@ bool xchk_da_process_error(struct xchk_da_btree *ds, int level, int *error);
/* Check for da btree corruption. */ /* Check for da btree corruption. */
void xchk_da_set_corrupt(struct xchk_da_btree *ds, int level); void xchk_da_set_corrupt(struct xchk_da_btree *ds, int level);
int xchk_da_btree_hash(struct xchk_da_btree *ds, int level, int xchk_da_btree_hash(struct xchk_da_btree *ds, int level, __be32 *hashp);
__be32 *hashp);
int xchk_da_btree(struct xfs_scrub *sc, int whichfork, int xchk_da_btree(struct xfs_scrub *sc, int whichfork,
xchk_da_btree_rec_fn scrub_fn, void *private); xchk_da_btree_rec_fn scrub_fn, void *private);

14
fs/xfs/scrub/repair.h
View File

@ -15,16 +15,14 @@ static inline int xrep_notsupported(struct xfs_scrub *sc)
/* Repair helpers */ /* Repair helpers */
int xrep_attempt(struct xfs_inode *ip, struct xfs_scrub *sc, int xrep_attempt(struct xfs_inode *ip, struct xfs_scrub *sc, bool *fixed);
bool *fixed);
void xrep_failure(struct xfs_mount *mp); void xrep_failure(struct xfs_mount *mp);
int xrep_roll_ag_trans(struct xfs_scrub *sc); int xrep_roll_ag_trans(struct xfs_scrub *sc);
bool xrep_ag_has_space(struct xfs_perag *pag, xfs_extlen_t nr_blocks, bool xrep_ag_has_space(struct xfs_perag *pag, xfs_extlen_t nr_blocks,
enum xfs_ag_resv_type type); enum xfs_ag_resv_type type);
xfs_extlen_t xrep_calc_ag_resblks(struct xfs_scrub *sc); xfs_extlen_t xrep_calc_ag_resblks(struct xfs_scrub *sc);
int xrep_alloc_ag_block(struct xfs_scrub *sc, int xrep_alloc_ag_block(struct xfs_scrub *sc, struct xfs_owner_info *oinfo,
struct xfs_owner_info *oinfo, xfs_fsblock_t *fsbno, xfs_fsblock_t *fsbno, enum xfs_ag_resv_type resv);
enum xfs_ag_resv_type resv);
int xrep_init_btblock(struct xfs_scrub *sc, xfs_fsblock_t fsb, int xrep_init_btblock(struct xfs_scrub *sc, xfs_fsblock_t fsb,
struct xfs_buf **bpp, xfs_btnum_t btnum, struct xfs_buf **bpp, xfs_btnum_t btnum,
const struct xfs_buf_ops *ops); const struct xfs_buf_ops *ops);
@ -78,10 +76,8 @@ struct xrep_find_ag_btree {
unsigned int height; unsigned int height;
}; };
int xrep_find_ag_btree_roots(struct xfs_scrub *sc, int xrep_find_ag_btree_roots(struct xfs_scrub *sc, struct xfs_buf *agf_bp,
struct xfs_buf *agf_bp, struct xrep_find_ag_btree *btree_info, struct xfs_buf *agfl_bp);
struct xrep_find_ag_btree *btree_info,
struct xfs_buf *agfl_bp);
void xrep_force_quotacheck(struct xfs_scrub *sc, uint dqtype); void xrep_force_quotacheck(struct xfs_scrub *sc, uint dqtype);
int xrep_ino_dqattach(struct xfs_scrub *sc); int xrep_ino_dqattach(struct xfs_scrub *sc);

38
fs/xfs/scrub/scrub.h
View File

@ -115,27 +115,25 @@ xchk_quota(struct xfs_scrub *sc)
#endif #endif
/* cross-referencing helpers */ /* cross-referencing helpers */
void xchk_xref_is_used_space(struct xfs_scrub *sc, void xchk_xref_is_used_space(struct xfs_scrub *sc, xfs_agblock_t agbno,
xfs_agblock_t agbno, xfs_extlen_t len); xfs_extlen_t len);
void xchk_xref_is_not_inode_chunk(struct xfs_scrub *sc, void xchk_xref_is_not_inode_chunk(struct xfs_scrub *sc, xfs_agblock_t agbno,
xfs_agblock_t agbno, xfs_extlen_t len); xfs_extlen_t len);
void xchk_xref_is_inode_chunk(struct xfs_scrub *sc, void xchk_xref_is_inode_chunk(struct xfs_scrub *sc, xfs_agblock_t agbno,
xfs_agblock_t agbno, xfs_extlen_t len); xfs_extlen_t len);
void xchk_xref_is_owned_by(struct xfs_scrub *sc, void xchk_xref_is_owned_by(struct xfs_scrub *sc, xfs_agblock_t agbno,
xfs_agblock_t agbno, xfs_extlen_t len, xfs_extlen_t len, struct xfs_owner_info *oinfo);
struct xfs_owner_info *oinfo); void xchk_xref_is_not_owned_by(struct xfs_scrub *sc, xfs_agblock_t agbno,
void xchk_xref_is_not_owned_by(struct xfs_scrub *sc, xfs_extlen_t len, struct xfs_owner_info *oinfo);
xfs_agblock_t agbno, xfs_extlen_t len, void xchk_xref_has_no_owner(struct xfs_scrub *sc, xfs_agblock_t agbno,
struct xfs_owner_info *oinfo); xfs_extlen_t len);
void xchk_xref_has_no_owner(struct xfs_scrub *sc, void xchk_xref_is_cow_staging(struct xfs_scrub *sc, xfs_agblock_t bno,
xfs_agblock_t agbno, xfs_extlen_t len); xfs_extlen_t len);
void xchk_xref_is_cow_staging(struct xfs_scrub *sc, void xchk_xref_is_not_shared(struct xfs_scrub *sc, xfs_agblock_t bno,
xfs_agblock_t bno, xfs_extlen_t len); xfs_extlen_t len);
void xchk_xref_is_not_shared(struct xfs_scrub *sc,
xfs_agblock_t bno, xfs_extlen_t len);
#ifdef CONFIG_XFS_RT #ifdef CONFIG_XFS_RT
void xchk_xref_is_used_rt_space(struct xfs_scrub *sc, void xchk_xref_is_used_rt_space(struct xfs_scrub *sc, xfs_rtblock_t rtbno,
xfs_rtblock_t rtbno, xfs_extlen_t len); xfs_extlen_t len);
#else #else
# define xchk_xref_is_used_rt_space(sc, rtbno, len) do { } while (0) # define xchk_xref_is_used_rt_space(sc, rtbno, len) do { } while (0)
#endif #endif