diff options
| author | Alex Elder <aelder@sgi.com> | 2009-09-16 04:37:47 +0200 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-09-16 04:37:47 +0200 |
| commit | fdec29c5fcd2705d61c1d14a1d4c74be03e9627c (patch) | |
| tree | bcf5d4dd46b4945f3b4bec6b763ff9a9484e4e59 /fs/xfs/xfs_ialloc.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 (diff) | |
| parent | xfs: includecheck fix for fs/xfs/xfs_iops.c (diff) | |
| download | linux-fdec29c5fcd2705d61c1d14a1d4c74be03e9627c.tar.xz linux-fdec29c5fcd2705d61c1d14a1d4c74be03e9627c.zip | |
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
Conflicts:
fs/xfs/linux-2.6/xfs_lrw.c
Diffstat (limited to 'fs/xfs/xfs_ialloc.h')
| -rw-r--r-- | fs/xfs/xfs_ialloc.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/fs/xfs/xfs_ialloc.h b/fs/xfs/xfs_ialloc.h index aeee8278f92c..bb5385475e1f 100644 --- a/fs/xfs/xfs_ialloc.h +++ b/fs/xfs/xfs_ialloc.h @@ -150,23 +150,15 @@ xfs_ialloc_pagi_init( xfs_agnumber_t agno); /* allocation group number */ /* - * Lookup the first record greater than or equal to ino - * in the btree given by cur. + * Lookup a record by ino in the btree given by cur. */ -int xfs_inobt_lookup_ge(struct xfs_btree_cur *cur, xfs_agino_t ino, - __int32_t fcnt, xfs_inofree_t free, int *stat); - -/* - * Lookup the first record less than or equal to ino - * in the btree given by cur. - */ -int xfs_inobt_lookup_le(struct xfs_btree_cur *cur, xfs_agino_t ino, - __int32_t fcnt, xfs_inofree_t free, int *stat); +int xfs_inobt_lookup(struct xfs_btree_cur *cur, xfs_agino_t ino, + xfs_lookup_t dir, int *stat); /* * Get the data from the pointed-to record. */ -extern int xfs_inobt_get_rec(struct xfs_btree_cur *cur, xfs_agino_t *ino, - __int32_t *fcnt, xfs_inofree_t *free, int *stat); +extern int xfs_inobt_get_rec(struct xfs_btree_cur *cur, + xfs_inobt_rec_incore_t *rec, int *stat); #endif /* __XFS_IALLOC_H__ */ |