diff options
| author |   Brian Foster <bfoster@redhat.com> | 2015-05-29 08:50:21 +1000 |
|---|---|---|
| committer |   Dave Chinner <david@fromorbit.com> | 2015-05-29 08:50:21 +1000 |
| commit | d4cc540b08e95386777b7e644fb384c2adc0da32 (patch) | |
| tree | c725bd18abe0adf09509154c3efc4635b81540af /fs/xfs/libxfs | |
| parent | Linux 4.1-rc2 (diff) | |
| download | linux-dev-d4cc540b08e95386777b7e644fb384c2adc0da32.tar.xz linux-dev-d4cc540b08e95386777b7e644fb384c2adc0da32.zip | |
xfs: create individual inode alloc. helper
Inode allocation from sparse inode records must filter the ir_free mask
against ir_holemask. In preparation for this requirement, create a
helper to allocate an individual inode from an inode record.
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/libxfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_ialloc.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 07349a183a11..a1868319b602 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -732,6 +732,16 @@ xfs_ialloc_get_rec( } /* + * Return the offset of the first free inode in the record. + */ +STATIC int +xfs_inobt_first_free_inode( + struct xfs_inobt_rec_incore *rec) +{ + return xfs_lowbit64(rec->ir_free); +} + +/* * Allocate an inode using the inobt-only algorithm. */ STATIC int @@ -961,7 +971,7 @@ newino: } alloc_inode: - offset = xfs_lowbit64(rec.ir_free); + offset = xfs_inobt_first_free_inode(&rec); ASSERT(offset >= 0); ASSERT(offset < XFS_INODES_PER_CHUNK); ASSERT((XFS_AGINO_TO_OFFSET(mp, rec.ir_startino) % @@ -1210,7 +1220,7 @@ xfs_dialloc_ag( if (error) goto error_cur; - offset = xfs_lowbit64(rec.ir_free); + offset = xfs_inobt_first_free_inode(&rec); ASSERT(offset >= 0); ASSERT(offset < XFS_INODES_PER_CHUNK); ASSERT((XFS_AGINO_TO_OFFSET(mp, rec.ir_startino) % |