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

xfs: fix confusing variable names in xfs_bmap_item.c 



Variable names in this code module are inconsistent and confusing.
xfs_map_extent describe file mappings, so rename them "map".
xfs_bmap_intents describe block mapping intents, so rename them "bi".

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent ddccb81b

fs/xfs/xfs_bmap_item.c

+28 −28
Original line number Diff line number Diff line
@@ -283,24 +283,24 @@ xfs_bmap_update_diff_items( 
/* Set the map extent flags for this mapping. */

static void

xfs_trans_set_bmap_flags(

	struct xfs_map_extent		*bmap,

	struct xfs_map_extent		*map,

	enum xfs_bmap_intent_type	type,

	int				whichfork,

	xfs_exntst_t			state)

{

	bmap->me_flags = 0;

	map->me_flags = 0;

	switch (type) {

	case XFS_BMAP_MAP:

	case XFS_BMAP_UNMAP:

		bmap->me_flags = type;

		map->me_flags = type;

		break;

	default:

		ASSERT(0);

	}

	if (state == XFS_EXT_UNWRITTEN)

		bmap->me_flags |= XFS_BMAP_EXTENT_UNWRITTEN;

		map->me_flags |= XFS_BMAP_EXTENT_UNWRITTEN;

	if (whichfork == XFS_ATTR_FORK)

		bmap->me_flags |= XFS_BMAP_EXTENT_ATTR_FORK;

		map->me_flags |= XFS_BMAP_EXTENT_ATTR_FORK;

}



/* Log bmap updates in the intent item. */
@@ -308,7 +308,7 @@ STATIC void 
xfs_bmap_update_log_item(

	struct xfs_trans		*tp,

	struct xfs_bui_log_item		*buip,

	struct xfs_bmap_intent		*bmap)

	struct xfs_bmap_intent		*bi)

{

	uint				next_extent;

	struct xfs_map_extent		*map;
@@ -324,12 +324,12 @@ xfs_bmap_update_log_item( 
	next_extent = atomic_inc_return(&buip->bui_next_extent) - 1;

	ASSERT(next_extent < buip->bui_format.bui_nextents);

	map = &buip->bui_format.bui_extents[next_extent];

	map->me_owner = bmap->bi_owner->i_ino;

	map->me_startblock = bmap->bi_bmap.br_startblock;

	map->me_startoff = bmap->bi_bmap.br_startoff;

	map->me_len = bmap->bi_bmap.br_blockcount;

	xfs_trans_set_bmap_flags(map, bmap->bi_type, bmap->bi_whichfork,

			bmap->bi_bmap.br_state);

	map->me_owner = bi->bi_owner->i_ino;

	map->me_startblock = bi->bi_bmap.br_startblock;

	map->me_startoff = bi->bi_bmap.br_startoff;

	map->me_len = bi->bi_bmap.br_blockcount;

	xfs_trans_set_bmap_flags(map, bi->bi_type, bi->bi_whichfork,

			bi->bi_bmap.br_state);

}



static struct xfs_log_item *
@@ -341,15 +341,15 @@ xfs_bmap_update_create_intent( 
{

	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_bui_log_item		*buip = xfs_bui_init(mp);

	struct xfs_bmap_intent		*bmap;

	struct xfs_bmap_intent		*bi;



	ASSERT(count == XFS_BUI_MAX_FAST_EXTENTS);



	xfs_trans_add_item(tp, &buip->bui_item);

	if (sort)

		list_sort(mp, items, xfs_bmap_update_diff_items);

	list_for_each_entry(bmap, items, bi_list)

		xfs_bmap_update_log_item(tp, buip, bmap);

	list_for_each_entry(bi, items, bi_list)

		xfs_bmap_update_log_item(tp, buip, bi);

	return &buip->bui_item;

}
@@ -398,10 +398,10 @@ STATIC void 
xfs_bmap_update_cancel_item(

	struct list_head		*item)

{

	struct xfs_bmap_intent		*bmap;

	struct xfs_bmap_intent		*bi;



	bmap = container_of(item, struct xfs_bmap_intent, bi_list);

	kmem_cache_free(xfs_bmap_intent_cache, bmap);

	bi = container_of(item, struct xfs_bmap_intent, bi_list);

	kmem_cache_free(xfs_bmap_intent_cache, bi);

}



const struct xfs_defer_op_type xfs_bmap_update_defer_type = {
@@ -419,18 +419,18 @@ xfs_bui_validate( 
	struct xfs_mount		*mp,

	struct xfs_bui_log_item		*buip)

{

	struct xfs_map_extent		*bmap;

	struct xfs_map_extent		*map;



	/* Only one mapping operation per BUI... */

	if (buip->bui_format.bui_nextents != XFS_BUI_MAX_FAST_EXTENTS)

		return false;



	bmap = &buip->bui_format.bui_extents[0];

	map = &buip->bui_format.bui_extents[0];



	if (bmap->me_flags & ~XFS_BMAP_EXTENT_FLAGS)

	if (map->me_flags & ~XFS_BMAP_EXTENT_FLAGS)

		return false;



	switch (bmap->me_flags & XFS_BMAP_EXTENT_TYPE_MASK) {

	switch (map->me_flags & XFS_BMAP_EXTENT_TYPE_MASK) {

	case XFS_BMAP_MAP:

	case XFS_BMAP_UNMAP:

		break;
@@ -438,13 +438,13 @@ xfs_bui_validate( 
		return false;

	}



	if (!xfs_verify_ino(mp, bmap->me_owner))

	if (!xfs_verify_ino(mp, map->me_owner))

		return false;



	if (!xfs_verify_fileext(mp, bmap->me_startoff, bmap->me_len))

	if (!xfs_verify_fileext(mp, map->me_startoff, map->me_len))

		return false;



	return xfs_verify_fsbext(mp, bmap->me_startblock, bmap->me_len);

	return xfs_verify_fsbext(mp, map->me_startblock, map->me_len);

}



/*
@@ -558,18 +558,18 @@ xfs_bui_item_relog( 
{

	struct xfs_bud_log_item		*budp;

	struct xfs_bui_log_item		*buip;

	struct xfs_map_extent		*extp;

	struct xfs_map_extent		*map;

	unsigned int			count;



	count = BUI_ITEM(intent)->bui_format.bui_nextents;

	extp = BUI_ITEM(intent)->bui_format.bui_extents;

	map = BUI_ITEM(intent)->bui_format.bui_extents;



	tp->t_flags |= XFS_TRANS_DIRTY;

	budp = xfs_trans_get_bud(tp, BUI_ITEM(intent));

	set_bit(XFS_LI_DIRTY, &budp->bud_item.li_flags);



	buip = xfs_bui_init(tp->t_mountp);

	memcpy(buip->bui_format.bui_extents, extp, count * sizeof(*extp));

	memcpy(buip->bui_format.bui_extents, map, count * sizeof(*map));

	atomic_set(&buip->bui_next_extent, count);

	xfs_trans_add_item(tp, &buip->bui_item);

	set_bit(XFS_LI_DIRTY, &buip->bui_item.li_flags);