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

xfs: prepare rmap functions to deal with rtrmapbt 



Prepare the high-level rmap functions to deal with the new realtime
rmapbt and its slightly different conventions.  Provide the ability
to talk to either rmapbt or rtrmapbt formats from the same high
level code.

Signed-off-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent d386b402

fs/xfs/libxfs/xfs_rmap.c

+63 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "xfs_ag.h"

#include "xfs_health.h"

#include "xfs_rmap_item.h"

#include "xfs_rtgroup.h"



struct kmem_cache	*xfs_rmap_intent_cache;
@@ -264,11 +265,69 @@ xfs_rmap_check_irec( 
	return NULL;

}



static xfs_failaddr_t

xfs_rtrmap_check_meta_irec(

	struct xfs_rtgroup		*rtg,

	const struct xfs_rmap_irec	*irec)

{

	struct xfs_mount		*mp = rtg_mount(rtg);



	if (irec->rm_offset != 0)

		return __this_address;

	if (irec->rm_flags & XFS_RMAP_UNWRITTEN)

		return __this_address;



	switch (irec->rm_owner) {

	case XFS_RMAP_OWN_FS:

		if (irec->rm_startblock != 0)

			return __this_address;

		if (irec->rm_blockcount != mp->m_sb.sb_rextsize)

			return __this_address;

		return NULL;

	default:

		return __this_address;

	}



	return NULL;

}



static xfs_failaddr_t

xfs_rtrmap_check_inode_irec(

	struct xfs_rtgroup		*rtg,

	const struct xfs_rmap_irec	*irec)

{

	struct xfs_mount		*mp = rtg_mount(rtg);



	if (!xfs_verify_ino(mp, irec->rm_owner))

		return __this_address;

	if (!xfs_verify_rgbext(rtg, irec->rm_startblock, irec->rm_blockcount))

		return __this_address;

	if (!xfs_verify_fileext(mp, irec->rm_offset, irec->rm_blockcount))

		return __this_address;

	return NULL;

}



xfs_failaddr_t

xfs_rtrmap_check_irec(

	struct xfs_rtgroup		*rtg,

	const struct xfs_rmap_irec	*irec)

{

	if (irec->rm_blockcount == 0)

		return __this_address;

	if (irec->rm_flags & (XFS_RMAP_BMBT_BLOCK | XFS_RMAP_ATTR_FORK))

		return __this_address;

	if (XFS_RMAP_NON_INODE_OWNER(irec->rm_owner))

		return xfs_rtrmap_check_meta_irec(rtg, irec);

	return xfs_rtrmap_check_inode_irec(rtg, irec);

}



static inline xfs_failaddr_t

xfs_rmap_check_btrec(

	struct xfs_btree_cur		*cur,

	const struct xfs_rmap_irec	*irec)

{

	if (xfs_btree_is_rtrmap(cur->bc_ops))

		return xfs_rtrmap_check_irec(to_rtg(cur->bc_group), irec);

	return xfs_rmap_check_irec(to_perag(cur->bc_group), irec);

}
@@ -283,6 +342,10 @@ xfs_rmap_complain_bad_rec( 
	if (xfs_btree_is_mem_rmap(cur->bc_ops))

		xfs_warn(mp,

 "In-Memory Reverse Mapping BTree record corruption detected at %pS!", fa);

	else if (xfs_btree_is_rtrmap(cur->bc_ops))

		xfs_warn(mp,

 "RT Reverse Mapping BTree record corruption in rtgroup %u detected at %pS!",

				cur->bc_group->xg_gno, fa);

	else

		xfs_warn(mp,

 "Reverse Mapping BTree record corruption in AG %d detected at %pS!",

fs/xfs/libxfs/xfs_rmap.h

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#define __XFS_RMAP_H__



struct xfs_perag;

struct xfs_rtgroup;



static inline void

xfs_rmap_ino_bmbt_owner(
@@ -206,6 +207,8 @@ xfs_failaddr_t xfs_rmap_btrec_to_irec(const union xfs_btree_rec *rec, 
		struct xfs_rmap_irec *irec);

xfs_failaddr_t xfs_rmap_check_irec(struct xfs_perag *pag,

		const struct xfs_rmap_irec *irec);

xfs_failaddr_t xfs_rtrmap_check_irec(struct xfs_rtgroup *rtg,

		const struct xfs_rmap_irec *irec);



int xfs_rmap_has_records(struct xfs_btree_cur *cur, xfs_agblock_t bno,

		xfs_extlen_t len, enum xbtree_recpacking *outcome);

fs/xfs/libxfs/xfs_rtgroup.h

+26 −0
Original line number Diff line number Diff line
@@ -132,6 +132,32 @@ xfs_rtgroup_next( 
	return xfs_rtgroup_next_range(mp, rtg, 0, mp->m_sb.sb_rgcount - 1);

}



static inline bool

xfs_verify_rgbno(

	struct xfs_rtgroup	*rtg,

	xfs_rgblock_t		rgbno)

{

	ASSERT(xfs_has_rtgroups(rtg_mount(rtg)));



	return xfs_verify_gbno(rtg_group(rtg), rgbno);

}



/*

 * Check that [@rgbno,@len] is a valid extent range in @rtg.

 *

 * Must only be used for RTG-enabled file systems.

 */

static inline bool

xfs_verify_rgbext(

	struct xfs_rtgroup	*rtg,

	xfs_rgblock_t		rgbno,

	xfs_extlen_t		len)

{

	ASSERT(xfs_has_rtgroups(rtg_mount(rtg)));



	return xfs_verify_gbext(rtg_group(rtg), rgbno, len);

}



static inline xfs_rtblock_t

xfs_rgbno_to_rtb(

	struct xfs_rtgroup	*rtg,