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

Commit e700a06c authored by Ben Myers's avatar Ben Myers
Browse files

xfs: make xfs_extent_busy_trim not static 



Commit e459df5, 'xfs: move busy extent handling to it's own file'
moved some code from xfs_alloc.c into xfs_extent_busy.c for
convenience in userspace code merges.  One of the functions moved is
xfs_extent_busy_trim (formerly xfs_alloc_busy_trim) which is defined
STATIC.  Unfortunately this function is still used in xfs_alloc.c, and
this results in an undefined symbol in xfs.ko.

Make xfs_extent_busy_trim not static and add its prototype to
xfs_extent_busy.h.

Signed-off-by: default avatarBen Myers <bpm@sgi.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
parent 611c9946

fs/xfs/xfs_alloc.c

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ STATIC int xfs_alloc_ag_vextent_near(xfs_alloc_arg_t *); 
STATIC int xfs_alloc_ag_vextent_size(xfs_alloc_arg_t *);

STATIC int xfs_alloc_ag_vextent_small(xfs_alloc_arg_t *,

		xfs_btree_cur_t *, xfs_agblock_t *, xfs_extlen_t *, int *);

STATIC void xfs_extent_busy_trim(struct xfs_alloc_arg *,

		xfs_agblock_t, xfs_extlen_t, xfs_agblock_t *, xfs_extlen_t *);



/*

 * Lookup the record equal to [bno, len] in the btree given by cur.

fs/xfs/xfs_extent_busy.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ xfs_extent_busy_reuse( 
 * args->minlen no suitable extent could be found, and the higher level

 * code needs to force out the log and retry the allocation.

 */

STATIC void

void

xfs_extent_busy_trim(

	struct xfs_alloc_arg	*args,

	xfs_agblock_t		bno,

fs/xfs/xfs_extent_busy.h

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ void 
xfs_extent_busy_reuse(struct xfs_mount *mp, xfs_agnumber_t agno,

	xfs_agblock_t fbno, xfs_extlen_t flen, bool userdata);



void

xfs_extent_busy_trim(struct xfs_alloc_arg *args, xfs_agblock_t bno,

	xfs_extlen_t len, xfs_agblock_t *rbno, xfs_extlen_t *rlen);



int

xfs_extent_busy_ag_cmp(void *priv, struct list_head *a, struct list_head *b);