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

Commit 3ab78df2 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Dave Chinner
Browse files

xfs: rework xfs_bmap_free callers to use xfs_defer_ops 



Restructure everything that used xfs_bmap_free to use xfs_defer_ops
instead.  For now we'll just remove the old symbols and play some
cpp magic to make it work; in the next patch we'll actually rename
everything.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 9749fee8

fs/xfs/libxfs/xfs_alloc.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "xfs_bit.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_defer.h"

#include "xfs_inode.h"

#include "xfs_btree.h"

#include "xfs_alloc_btree.h"

fs/xfs/libxfs/xfs_attr.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "xfs_trans_resv.h"

#include "xfs_bit.h"

#include "xfs_mount.h"

#include "xfs_defer.h"

#include "xfs_da_format.h"

#include "xfs_da_btree.h"

#include "xfs_attr_sf.h"

fs/xfs/libxfs/xfs_attr_remote.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "xfs_trans_resv.h"

#include "xfs_bit.h"

#include "xfs_mount.h"

#include "xfs_defer.h"

#include "xfs_da_format.h"

#include "xfs_da_btree.h"

#include "xfs_inode.h"

fs/xfs/libxfs/xfs_bmap.c

+11 −44
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "xfs_bit.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_defer.h"

#include "xfs_da_format.h"

#include "xfs_da_btree.h"

#include "xfs_dir2.h"
@@ -595,41 +596,7 @@ xfs_bmap_add_free( 
	new = kmem_zone_alloc(xfs_bmap_free_item_zone, KM_SLEEP);

	new->xbfi_startblock = bno;

	new->xbfi_blockcount = (xfs_extlen_t)len;

	list_add(&new->xbfi_list, &flist->xbf_flist);

	flist->xbf_count++;

}



/*

 * Remove the entry "free" from the free item list.  Prev points to the

 * previous entry, unless "free" is the head of the list.

 */

void

xfs_bmap_del_free(

	struct xfs_bmap_free		*flist,	/* free item list header */

	struct xfs_bmap_free_item	*free)	/* list item to be freed */

{

	list_del(&free->xbfi_list);

	flist->xbf_count--;

	kmem_zone_free(xfs_bmap_free_item_zone, free);

}



/*

 * Free up any items left in the list.

 */

void

xfs_bmap_cancel(

	struct xfs_bmap_free		*flist)	/* list of bmap_free_items */

{

	struct xfs_bmap_free_item	*free;	/* free list item */



	if (flist->xbf_count == 0)

		return;

	while (!list_empty(&flist->xbf_flist)) {

		free = list_first_entry(&flist->xbf_flist,

				struct xfs_bmap_free_item, xbfi_list);

		xfs_bmap_del_free(flist, free);

	}

	ASSERT(flist->xbf_count == 0);

	xfs_defer_add(flist, XFS_DEFER_OPS_TYPE_FREE, &new->xbfi_list);

}



/*
@@ -767,7 +734,7 @@ xfs_bmap_extents_to_btree( 
	if (*firstblock == NULLFSBLOCK) {

		args.type = XFS_ALLOCTYPE_START_BNO;

		args.fsbno = XFS_INO_TO_FSB(mp, ip->i_ino);

	} else if (flist->xbf_low) {

	} else if (flist->dop_low) {

		args.type = XFS_ALLOCTYPE_START_BNO;

		args.fsbno = *firstblock;

	} else {
@@ -788,7 +755,7 @@ xfs_bmap_extents_to_btree( 
	ASSERT(args.fsbno != NULLFSBLOCK);

	ASSERT(*firstblock == NULLFSBLOCK ||

	       args.agno == XFS_FSB_TO_AGNO(mp, *firstblock) ||

	       (flist->xbf_low &&

	       (flist->dop_low &&

		args.agno > XFS_FSB_TO_AGNO(mp, *firstblock)));

	*firstblock = cur->bc_private.b.firstblock = args.fsbno;

	cur->bc_private.b.allocated++;
@@ -3708,7 +3675,7 @@ xfs_bmap_btalloc( 
			error = xfs_bmap_btalloc_nullfb(ap, &args, &blen);

		if (error)

			return error;

	} else if (ap->flist->xbf_low) {

	} else if (ap->flist->dop_low) {

		if (xfs_inode_is_filestream(ap->ip))

			args.type = XFS_ALLOCTYPE_FIRST_AG;

		else
@@ -3741,7 +3708,7 @@ xfs_bmap_btalloc( 
	 * is >= the stripe unit and the allocation offset is

	 * at the end of file.

	 */

	if (!ap->flist->xbf_low && ap->aeof) {

	if (!ap->flist->dop_low && ap->aeof) {

		if (!ap->offset) {

			args.alignment = stripe_align;

			atype = args.type;
@@ -3834,7 +3801,7 @@ xfs_bmap_btalloc( 
		args.minleft = 0;

		if ((error = xfs_alloc_vextent(&args)))

			return error;

		ap->flist->xbf_low = 1;

		ap->flist->dop_low = true;

	}

	if (args.fsbno != NULLFSBLOCK) {

		/*
@@ -3844,7 +3811,7 @@ xfs_bmap_btalloc( 
		ASSERT(*ap->firstblock == NULLFSBLOCK ||

		       XFS_FSB_TO_AGNO(mp, *ap->firstblock) ==

		       XFS_FSB_TO_AGNO(mp, args.fsbno) ||

		       (ap->flist->xbf_low &&

		       (ap->flist->dop_low &&

			XFS_FSB_TO_AGNO(mp, *ap->firstblock) <

			XFS_FSB_TO_AGNO(mp, args.fsbno)));
@@ -3852,7 +3819,7 @@ xfs_bmap_btalloc( 
		if (*ap->firstblock == NULLFSBLOCK)

			*ap->firstblock = args.fsbno;

		ASSERT(nullfb || fb_agno == args.agno ||

		       (ap->flist->xbf_low && fb_agno < args.agno));

		       (ap->flist->dop_low && fb_agno < args.agno));

		ap->length = args.len;

		ap->ip->i_d.di_nblocks += args.len;

		xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE);
@@ -4319,7 +4286,7 @@ xfs_bmapi_allocate( 
	if (error)

		return error;



	if (bma->flist->xbf_low)

	if (bma->flist->dop_low)

		bma->minleft = 0;

	if (bma->cur)

		bma->cur->bc_private.b.firstblock = *bma->firstblock;
@@ -4684,7 +4651,7 @@ xfs_bmapi_write( 
			       XFS_FSB_TO_AGNO(mp, *firstblock) ==

			       XFS_FSB_TO_AGNO(mp,

				       bma.cur->bc_private.b.firstblock) ||

			       (flist->xbf_low &&

			       (flist->dop_low &&

				XFS_FSB_TO_AGNO(mp, *firstblock) <

				XFS_FSB_TO_AGNO(mp,

					bma.cur->bc_private.b.firstblock)));

fs/xfs/libxfs/xfs_bmap.h

+0 −32
Original line number Diff line number Diff line
@@ -69,27 +69,6 @@ struct xfs_bmap_free_item 
	struct list_head	xbfi_list;

};



/*

 * Header for free extent list.

 *

 * xbf_low is used by the allocator to activate the lowspace algorithm -

 * when free space is running low the extent allocator may choose to

 * allocate an extent from an AG without leaving sufficient space for

 * a btree split when inserting the new extent.  In this case the allocator

 * will enable the lowspace algorithm which is supposed to allow further

 * allocations (such as btree splits and newroots) to allocate from

 * sequential AGs.  In order to avoid locking AGs out of order the lowspace

 * algorithm will start searching for free space from AG 0.  If the correct

 * transaction reservations have been made then this algorithm will eventually

 * find all the space it needs.

 */

typedef	struct xfs_bmap_free

{

	struct list_head	xbf_flist;	/* list of to-be-free extents */

	int			xbf_count;	/* count of items on list */

	int			xbf_low;	/* alloc in low mode */

} xfs_bmap_free_t;



#define	XFS_BMAP_MAX_NMAP	4



/*
@@ -139,14 +118,6 @@ static inline int xfs_bmapi_aflag(int w) 
#define	DELAYSTARTBLOCK		((xfs_fsblock_t)-1LL)

#define	HOLESTARTBLOCK		((xfs_fsblock_t)-2LL)



static inline void xfs_bmap_init(xfs_bmap_free_t *flp, xfs_fsblock_t *fbp)

{

	INIT_LIST_HEAD(&flp->xbf_flist);

	flp->xbf_count = 0;

	flp->xbf_low = 0;

	*fbp = NULLFSBLOCK;

}



/*

 * Flags for xfs_bmap_add_extent*.

 */
@@ -195,9 +166,6 @@ int xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd); 
void	xfs_bmap_local_to_extents_empty(struct xfs_inode *ip, int whichfork);

void	xfs_bmap_add_free(struct xfs_mount *mp, struct xfs_bmap_free *flist,

			  xfs_fsblock_t bno, xfs_filblks_t len);

void	xfs_bmap_cancel(struct xfs_bmap_free *flist);

int	xfs_bmap_finish(struct xfs_trans **tp, struct xfs_bmap_free *flist,

			struct xfs_inode *ip);

void	xfs_bmap_compute_maxlevels(struct xfs_mount *mp, int whichfork);

int	xfs_bmap_first_unused(struct xfs_trans *tp, struct xfs_inode *ip,

		xfs_extlen_t len, xfs_fileoff_t *unused, int whichfork);