Commit 032d91f9 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

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: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 1d8a748a

fs/xfs/scrub/btree.c

+86 −86
Original line number Original line Diff line number Diff line
@@ -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;

fs/xfs/scrub/btree.h

+12 −13
Original line number Original line Diff line number Diff line
@@ -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__ */

fs/xfs/scrub/common.h

+10 −13
Original line number Original line Diff line number Diff line
@@ -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);





/*

/*

fs/xfs/scrub/dabtree.h

+10 −11
Original line number Original line Diff line number Diff line
@@ -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);

fs/xfs/scrub/repair.h

+12 −16
Original line number Original line Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE