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

Commit 689e11c8 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: superblock scrub should use short-lived buffers 



Secondary superblocks are rarely used, so create a helper to read a
given non-primary AG's superblock and ensure that it won't stick around
hogging memory.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 8389f3ff

fs/xfs/libxfs/xfs_sb.c

+22 −0
Original line number Diff line number Diff line
@@ -972,3 +972,25 @@ xfs_fs_geometry( 


	return 0;

}



/* Read a secondary superblock. */

int

xfs_sb_read_secondary(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	xfs_agnumber_t		agno,

	struct xfs_buf		**bpp)

{

	struct xfs_buf		*bp;

	int			error;



	ASSERT(agno != 0 && agno != NULLAGNUMBER);

	error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,

			XFS_AG_DADDR(mp, agno, XFS_SB_BLOCK(mp)),

			XFS_FSS_TO_BB(mp, 1), 0, &bp, &xfs_sb_buf_ops);

	if (error)

		return error;

	xfs_buf_set_ref(bp, XFS_SSB_REF);

	*bpp = bp;

	return 0;

}

fs/xfs/libxfs/xfs_sb.h

+3 −0
Original line number Diff line number Diff line
@@ -37,5 +37,8 @@ extern void xfs_sb_quota_from_disk(struct xfs_sb *sbp); 
#define XFS_FS_GEOM_MAX_STRUCT_VER	(4)

extern int	xfs_fs_geometry(struct xfs_sb *sbp, struct xfs_fsop_geom *geo,

				int struct_version);

extern int	xfs_sb_read_secondary(struct xfs_mount *mp,

				struct xfs_trans *tp, xfs_agnumber_t agno,

				struct xfs_buf **bpp);



#endif	/* __XFS_SB_H__ */

fs/xfs/libxfs/xfs_shared.h

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ void xfs_log_get_max_trans_res(struct xfs_mount *mp, 
#define	XFS_ATTR_BTREE_REF	1

#define	XFS_DQUOT_REF		1

#define	XFS_REFC_BTREE_REF	1

#define	XFS_SSB_REF		0



/*

 * Flags for xfs_trans_ichgtime().

fs/xfs/scrub/agheader.c

+1 −3
Original line number Diff line number Diff line
@@ -157,9 +157,7 @@ xfs_scrub_superblock( 
	if (agno == 0)

		return 0;



	error = xfs_trans_read_buf(mp, sc->tp, mp->m_ddev_targp,

		  XFS_AGB_TO_DADDR(mp, agno, XFS_SB_BLOCK(mp)),

		  XFS_FSS_TO_BB(mp, 1), 0, &bp, &xfs_sb_buf_ops);

	error = xfs_sb_read_secondary(mp, sc->tp, agno, &bp);

	/*

	 * The superblock verifier can return several different error codes

	 * if it thinks the superblock doesn't look right.  For a mount these