diff options
| author |   Ben Myers <bpm@sgi.com> | 2012-05-10 13:55:33 -0500 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-05-14 16:21:04 -0500 |
| commit | e700a06c71dbbc0879a5d15881cca7b772282484 (patch) | |
| tree | fdd09e1d5b44ec203b1da949f1a65ac2fb2428bb /fs/xfs | |
| parent | xfs: make XBF_MAPPED the default behaviour (diff) | |
| download | linux-dev-e700a06c71dbbc0879a5d15881cca7b772282484.tar.xz linux-dev-e700a06c71dbbc0879a5d15881cca7b772282484.zip | |
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: Ben Myers <bpm@sgi.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_alloc.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_extent_busy.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_extent_busy.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c index 588496de0f93..229641fb8e67 100644 --- a/fs/xfs/xfs_alloc.c +++ b/fs/xfs/xfs_alloc.c @@ -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. diff --git a/fs/xfs/xfs_extent_busy.c b/fs/xfs/xfs_extent_busy.c index 9475bd989379..85e9f87a1a7c 100644 --- a/fs/xfs/xfs_extent_busy.c +++ b/fs/xfs/xfs_extent_busy.c @@ -345,7 +345,7 @@ restart: * 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, diff --git a/fs/xfs/xfs_extent_busy.h b/fs/xfs/xfs_extent_busy.h index 91f2fcbb2001..985412d65ba5 100644 --- a/fs/xfs/xfs_extent_busy.h +++ b/fs/xfs/xfs_extent_busy.h @@ -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); |