Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d8a748a authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: shorten struct xfs_scrub_context to struct xfs_scrub 



Shorten the name of the online fsck context structure.  Whitespace
damage will be fixed by a subsequent patch.  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 b5e2196e

fs/xfs/scrub/agheader.c

+16 −16
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
/* Cross-reference with the other btrees. */

STATIC void

xchk_superblock_xref(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	struct xfs_buf			*bp)

{

	struct xfs_owner_info		oinfo;
@@ -66,7 +66,7 @@ xchk_superblock_xref( 
 */

int

xchk_superblock(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_mount		*mp = sc->mp;

	struct xfs_buf			*bp;
@@ -365,7 +365,7 @@ xchk_agf_record_bno_lengths( 
/* Check agf_freeblks */

static inline void

xchk_agf_xref_freeblks(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_agf			*agf = XFS_BUF_TO_AGF(sc->sa.agf_bp);

	xfs_extlen_t			blocks = 0;
@@ -385,7 +385,7 @@ xchk_agf_xref_freeblks( 
/* Cross reference the AGF with the cntbt (freespace by length btree) */

static inline void

xchk_agf_xref_cntbt(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_agf			*agf = XFS_BUF_TO_AGF(sc->sa.agf_bp);

	xfs_agblock_t			agbno;
@@ -417,7 +417,7 @@ xchk_agf_xref_cntbt( 
/* Check the btree block counts in the AGF against the btrees. */

STATIC void

xchk_agf_xref_btreeblks(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_agf			*agf = XFS_BUF_TO_AGF(sc->sa.agf_bp);

	struct xfs_mount		*mp = sc->mp;
@@ -463,7 +463,7 @@ xchk_agf_xref_btreeblks( 
/* Check agf_refcount_blocks against tree size */

static inline void

xchk_agf_xref_refcblks(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_agf			*agf = XFS_BUF_TO_AGF(sc->sa.agf_bp);

	xfs_agblock_t			blocks;
@@ -482,7 +482,7 @@ xchk_agf_xref_refcblks( 
/* Cross-reference with the other btrees. */

STATIC void

xchk_agf_xref(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_owner_info		oinfo;

	struct xfs_mount		*mp = sc->mp;
@@ -514,7 +514,7 @@ xchk_agf_xref( 
/* Scrub the AGF. */

int

xchk_agf(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_mount		*mp = sc->mp;

	struct xfs_agf			*agf;
@@ -602,13 +602,13 @@ struct xchk_agfl_info { 
	unsigned int			sz_entries;

	unsigned int			nr_entries;

	xfs_agblock_t			*entries;

	struct xfs_scrub_context	*sc;

	struct xfs_scrub	*sc;

};



/* Cross-reference with the other btrees. */

STATIC void

xchk_agfl_block_xref(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	xfs_agblock_t			agbno,

	struct xfs_owner_info		*oinfo)

{
@@ -629,7 +629,7 @@ xchk_agfl_block( 
	void				*priv)

{

	struct xchk_agfl_info		*sai = priv;

	struct xfs_scrub_context	*sc = sai->sc;

	struct xfs_scrub	*sc = sai->sc;

	xfs_agnumber_t			agno = sc->sa.agno;



	if (xfs_verify_agbno(mp, agno, agbno) &&
@@ -660,7 +660,7 @@ xchk_agblock_cmp( 
/* Cross-reference with the other btrees. */

STATIC void

xchk_agfl_xref(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_owner_info		oinfo;

	struct xfs_mount		*mp = sc->mp;
@@ -691,7 +691,7 @@ xchk_agfl_xref( 
/* Scrub the AGFL. */

int

xchk_agfl(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xchk_agfl_info		sai;

	struct xfs_agf			*agf;
@@ -768,7 +768,7 @@ xchk_agfl( 
/* Check agi_count/agi_freecount */

static inline void

xchk_agi_xref_icounts(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_agi			*agi = XFS_BUF_TO_AGI(sc->sa.agi_bp);

	xfs_agino_t			icount;
@@ -789,7 +789,7 @@ xchk_agi_xref_icounts( 
/* Cross-reference with the other btrees. */

STATIC void

xchk_agi_xref(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_owner_info		oinfo;

	struct xfs_mount		*mp = sc->mp;
@@ -818,7 +818,7 @@ xchk_agi_xref( 
/* Scrub the AGI. */

int

xchk_agi(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_mount		*mp = sc->mp;

	struct xfs_agi			*agi;

fs/xfs/scrub/agheader_repair.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
/* Repair the superblock. */

int

xrep_superblock(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xfs_mount		*mp = sc->mp;

	struct xfs_buf			*bp;

fs/xfs/scrub/alloc.c

+7 −7
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 */

int

xchk_setup_ag_allocbt(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	struct xfs_inode		*ip)

{

	return xchk_setup_ag_btree(sc, ip, false);
@@ -42,7 +42,7 @@ xchk_setup_ag_allocbt( 
 */

STATIC void

xchk_allocbt_xref_other(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	xfs_agblock_t			agbno,

	xfs_extlen_t			len)

{
@@ -82,7 +82,7 @@ xchk_allocbt_xref_other( 
/* Cross-reference with the other btrees. */

STATIC void

xchk_allocbt_xref(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	xfs_agblock_t			agbno,

	xfs_extlen_t			len)

{
@@ -123,7 +123,7 @@ xchk_allocbt_rec( 
/* Scrub the freespace btrees for some AG. */

STATIC int

xchk_allocbt(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	xfs_btnum_t			which)

{

	struct xfs_owner_info		oinfo;
@@ -136,14 +136,14 @@ xchk_allocbt( 


int

xchk_bnobt(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	return xchk_allocbt(sc, XFS_BTNUM_BNO);

}



int

xchk_cntbt(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	return xchk_allocbt(sc, XFS_BTNUM_CNT);

}
@@ -151,7 +151,7 @@ xchk_cntbt( 
/* xref check that the extent is not free */

void

xchk_xref_is_used_space(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	xfs_agblock_t			agbno,

	xfs_extlen_t			len)

{

fs/xfs/scrub/attr.c

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
/* Set us up to scrub an inode's extended attributes. */

int

xchk_setup_xattr(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	struct xfs_inode		*ip)

{

	size_t				sz;
@@ -57,7 +57,7 @@ xchk_setup_xattr( 


struct xchk_xattr {

	struct xfs_attr_list_context	context;

	struct xfs_scrub_context	*sc;

	struct xfs_scrub	*sc;

};



/*
@@ -127,7 +127,7 @@ xchk_xattr_listent( 
 */

STATIC bool

xchk_xattr_set_map(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	unsigned long			*map,

	unsigned int			start,

	unsigned int			len)
@@ -155,7 +155,7 @@ xchk_xattr_set_map( 
 */

STATIC bool

xchk_xattr_check_freemap(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	unsigned long			*map,

	struct xfs_attr3_icleaf_hdr	*leafhdr)

{
@@ -405,7 +405,7 @@ xchk_xattr_rec( 
/* Scrub the extended attribute metadata. */

int

xchk_xattr(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	struct xchk_xattr		sx;

	struct attrlist_cursor_kern	cursor = { 0 };

fs/xfs/scrub/bmap.c

+11 −11
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
/* Set us up with an inode's bmap. */

int

xchk_setup_inode_bmap(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	struct xfs_inode		*ip)

{

	int				error;
@@ -79,7 +79,7 @@ xchk_setup_inode_bmap( 
 */



struct xchk_bmap_info {

	struct xfs_scrub_context	*sc;

	struct xfs_scrub	*sc;

	xfs_fileoff_t			lastoff;

	bool				is_rt;

	bool				is_shared;
@@ -391,7 +391,7 @@ xchk_bmapbt_rec( 
/* Scan the btree records. */

STATIC int

xchk_bmap_btree(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	int				whichfork,

	struct xchk_bmap_info		*info)

{
@@ -409,7 +409,7 @@ xchk_bmap_btree( 
}



struct xchk_bmap_check_rmap_info {

	struct xfs_scrub_context	*sc;

	struct xfs_scrub	*sc;

	int				whichfork;

	struct xfs_iext_cursor		icur;

};
@@ -424,7 +424,7 @@ xchk_bmap_check_rmap( 
	struct xfs_bmbt_irec		irec;

	struct xchk_bmap_check_rmap_info	*sbcri = priv;

	struct xfs_ifork		*ifp;

	struct xfs_scrub_context	*sc = sbcri->sc;

	struct xfs_scrub	*sc = sbcri->sc;

	bool				have_map;



	/* Is this even the right fork? */
@@ -488,7 +488,7 @@ xchk_bmap_check_rmap( 
/* Make sure each rmap has a corresponding bmbt entry. */

STATIC int

xchk_bmap_check_ag_rmaps(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	int				whichfork,

	xfs_agnumber_t			agno)

{
@@ -522,7 +522,7 @@ xchk_bmap_check_ag_rmaps( 
/* Make sure each rmap has a corresponding bmbt entry. */

STATIC int

xchk_bmap_check_rmaps(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	int				whichfork)

{

	loff_t				size;
@@ -579,7 +579,7 @@ xchk_bmap_check_rmaps( 
 */

STATIC int

xchk_bmap(

	struct xfs_scrub_context	*sc,

	struct xfs_scrub	*sc,

	int				whichfork)

{

	struct xfs_bmbt_irec		irec;
@@ -694,7 +694,7 @@ xchk_bmap( 
/* Scrub an inode's data fork. */

int

xchk_bmap_data(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	return xchk_bmap(sc, XFS_DATA_FORK);

}
@@ -702,7 +702,7 @@ xchk_bmap_data( 
/* Scrub an inode's attr fork. */

int

xchk_bmap_attr(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	return xchk_bmap(sc, XFS_ATTR_FORK);

}
@@ -710,7 +710,7 @@ xchk_bmap_attr( 
/* Scrub an inode's CoW fork. */

int

xchk_bmap_cow(

	struct xfs_scrub_context	*sc)

	struct xfs_scrub	*sc)

{

	if (!xfs_is_reflink_inode(sc->ip))

		return -ENOENT;