rec.br_blockcount = 1;
rec.br_state = XFS_EXT_NORM;
xfs_iext_first(ifp, &icur);
- xfs_iext_insert(ip, &icur, 1, &rec, 0);
+ xfs_iext_insert(ip, &icur, &rec, 0);
XFS_IFORK_NEXT_SET(ip, whichfork, 1);
ip->i_d.di_nblocks = 1;
goto out_brelse;
}
xfs_bmbt_disk_get_all(frp, &new);
- xfs_iext_insert(ip, &icur, 1, &new, state);
+ xfs_iext_insert(ip, &icur, &new, state);
trace_xfs_read_extent(ip, &icur, state, _THIS_IP_);
xfs_iext_next(ifp, &icur);
}
PREV.br_blockcount = temp;
PREV.br_startblock = nullstartblock(da_new);
xfs_iext_next(ifp, &bma->icur);
- xfs_iext_insert(bma->ip, &bma->icur, 1, &PREV, state);
+ xfs_iext_insert(bma->ip, &bma->icur, &PREV, state);
xfs_iext_prev(ifp, &bma->icur);
break;
PREV.br_startblock = nullstartblock(da_new);
PREV.br_blockcount = temp;
- xfs_iext_insert(bma->ip, &bma->icur, 1, &PREV, state);
+ xfs_iext_insert(bma->ip, &bma->icur, &PREV, state);
xfs_iext_next(ifp, &bma->icur);
break;
PREV.br_blockcount));
xfs_iext_update_extent(bma->ip, state, &bma->icur, &PREV);
- /* insert LEFT (r[0]) and RIGHT (r[1]) at the same time */
xfs_iext_next(ifp, &bma->icur);
- xfs_iext_insert(bma->ip, &bma->icur, 2, &LEFT, state);
+ xfs_iext_insert(bma->ip, &bma->icur, &RIGHT, state);
+ xfs_iext_insert(bma->ip, &bma->icur, &LEFT, state);
(*nextents)++;
if (bma->cur == NULL)
PREV.br_blockcount -= new->br_blockcount;
xfs_iext_update_extent(ip, state, icur, &PREV);
- xfs_iext_insert(ip, icur, 1, new, state);
+ xfs_iext_insert(ip, icur, new, state);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
if (cur == NULL)
xfs_iext_update_extent(ip, state, icur, &PREV);
xfs_iext_next(ifp, icur);
- xfs_iext_insert(ip, icur, 1, new, state);
+ xfs_iext_insert(ip, icur, new, state);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
xfs_iext_update_extent(ip, state, icur, &PREV);
xfs_iext_next(ifp, icur);
- xfs_iext_insert(ip, icur, 2, &r[0], state);
+ xfs_iext_insert(ip, icur, &r[1], state);
+ xfs_iext_insert(ip, icur, &r[0], state);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) + 2);
* Insert a new entry.
*/
oldlen = newlen = 0;
- xfs_iext_insert(ip, icur, 1, new, state);
+ xfs_iext_insert(ip, icur, new, state);
break;
}
if (oldlen != newlen) {
* real allocation.
* Insert a new entry.
*/
- xfs_iext_insert(ip, icur, 1, new, state);
+ xfs_iext_insert(ip, icur, new, state);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
if (cur == NULL) {
xfs_iext_update_extent(ip, state, icur, got);
xfs_iext_next(ifp, icur);
- xfs_iext_insert(ip, icur, 1, &new, state);
+ xfs_iext_insert(ip, icur, &new, state);
da_new = got_indlen + new_indlen - stolen;
del->br_blockcount -= stolen;
xfs_iext_update_extent(ip, state, icur, got);
xfs_iext_next(ifp, icur);
- xfs_iext_insert(ip, icur, 1, &new, state);
+ xfs_iext_insert(ip, icur, &new, state);
break;
}
}
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
xfs_iext_next(ifp, icur);
- xfs_iext_insert(ip, icur, 1, &new, state);
+ xfs_iext_insert(ip, icur, &new, state);
break;
}
/* Add new extent */
xfs_iext_next(ifp, &icur);
- xfs_iext_insert(ip, &icur, 1, &new, 0);
+ xfs_iext_insert(ip, &icur, &new, 0);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
cur->leaf = new;
}
-static void
-__xfs_iext_insert(
- struct xfs_ifork *ifp,
+void
+xfs_iext_insert(
+ struct xfs_inode *ip,
struct xfs_iext_cursor *cur,
- struct xfs_bmbt_irec *irec)
+ struct xfs_bmbt_irec *irec,
+ int state)
{
+ struct xfs_ifork *ifp = xfs_iext_state_to_fork(ip, state);
xfs_fileoff_t offset = irec->br_startoff;
struct xfs_iext_leaf *new = NULL;
int nr_entries, i;
+ trace_xfs_iext_insert(ip, cur, state, _RET_IP_);
+
if (ifp->if_height == 0)
xfs_iext_alloc_root(ifp, cur);
else if (ifp->if_height == 1)
xfs_iext_insert_node(ifp, xfs_iext_leaf_key(new, 0), new, 2);
}
-void
-xfs_iext_insert(
- struct xfs_inode *ip,
- struct xfs_iext_cursor *cur,
- xfs_extnum_t nr_extents,
- struct xfs_bmbt_irec *new,
- int state)
-{
- struct xfs_ifork *ifp = xfs_iext_state_to_fork(ip, state);
- int i;
-
- ASSERT(nr_extents > 0);
-
- for (i = nr_extents - 1; i >= 0; i--) {
- __xfs_iext_insert(ifp, cur, new + i);
- trace_xfs_iext_insert(ip, cur, state, _RET_IP_);
- }
-}
-
static struct xfs_iext_node *
xfs_iext_rebalance_node(
struct xfs_iext_node *parent,