p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfs: export _inobt_btrec_to_irec and _ialloc_cluster_alignment for scrub 

Create a function to extract an in-core inobt record from a generic
btree_rec union so that scrub will be able to check inobt records
and check inode block alignment.

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 2017-06-16 11:00:08 -07:00
parent 118bb47e28
commit e936945ee4
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fs/xfs/libxfs/xfs_ialloc.c
View File

@ -46,7 +46,7 @@
/* /*
* Allocation group level functions. * Allocation group level functions.
*/ */
static inline int int
xfs_ialloc_cluster_alignment( xfs_ialloc_cluster_alignment(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
@ -98,24 +98,15 @@ xfs_inobt_update(
return xfs_btree_update(cur, &rec); return xfs_btree_update(cur, &rec);
} }
/* /* Convert on-disk btree record to incore inobt record. */
* Get the data from the pointed-to record. void
*/ xfs_inobt_btrec_to_irec(
int /* error */ struct xfs_mount *mp,
xfs_inobt_get_rec( union xfs_btree_rec *rec,
struct xfs_btree_cur *cur, /* btree cursor */ struct xfs_inobt_rec_incore *irec)
xfs_inobt_rec_incore_t *irec, /* btree record */
int *stat) /* output: success/failure */
{ {
union xfs_btree_rec *rec;
int error;
error = xfs_btree_get_rec(cur, &rec, stat);
if (error || *stat == 0)
return error;
irec->ir_startino = be32_to_cpu(rec->inobt.ir_startino); irec->ir_startino = be32_to_cpu(rec->inobt.ir_startino);
if (xfs_sb_version_hassparseinodes(&cur->bc_mp->m_sb)) { if (xfs_sb_version_hassparseinodes(&mp->m_sb)) {
irec->ir_holemask = be16_to_cpu(rec->inobt.ir_u.sp.ir_holemask); irec->ir_holemask = be16_to_cpu(rec->inobt.ir_u.sp.ir_holemask);
irec->ir_count = rec->inobt.ir_u.sp.ir_count; irec->ir_count = rec->inobt.ir_u.sp.ir_count;
irec->ir_freecount = rec->inobt.ir_u.sp.ir_freecount; irec->ir_freecount = rec->inobt.ir_u.sp.ir_freecount;
@ -130,6 +121,25 @@ xfs_inobt_get_rec(
be32_to_cpu(rec->inobt.ir_u.f.ir_freecount); be32_to_cpu(rec->inobt.ir_u.f.ir_freecount);
} }
irec->ir_free = be64_to_cpu(rec->inobt.ir_free); irec->ir_free = be64_to_cpu(rec->inobt.ir_free);
}
/*
* Get the data from the pointed-to record.
*/
int
xfs_inobt_get_rec(
struct xfs_btree_cur *cur,
struct xfs_inobt_rec_incore *irec,
int *stat)
{
union xfs_btree_rec *rec;
int error;
error = xfs_btree_get_rec(cur, &rec, stat);
if (error || *stat == 0)
return error;
xfs_inobt_btrec_to_irec(cur->bc_mp, rec, irec);
return 0; return 0;
} }

5
fs/xfs/libxfs/xfs_ialloc.h
View File

@ -168,5 +168,10 @@ int xfs_ialloc_inode_init(struct xfs_mount *mp, struct xfs_trans *tp,
int xfs_read_agi(struct xfs_mount *mp, struct xfs_trans *tp, int xfs_read_agi(struct xfs_mount *mp, struct xfs_trans *tp,
xfs_agnumber_t agno, struct xfs_buf **bpp); xfs_agnumber_t agno, struct xfs_buf **bpp);
union xfs_btree_rec;
void xfs_inobt_btrec_to_irec(struct xfs_mount *mp, union xfs_btree_rec *rec,
struct xfs_inobt_rec_incore *irec);
int xfs_ialloc_cluster_alignment(struct xfs_mount *mp);
#endif /* __XFS_IALLOC_H__ */ #endif /* __XFS_IALLOC_H__ */