Skip to content

L
linux
Commit 4eea22f0 authored by Mandy Kirkconnell's avatar Mandy Kirkconnell Committed by Nathan Scott
Browse files
Options

[XFS] 929045 567344 This mod re-organizes some of the in-core file extent 

code to prepare for an upcoming mod which will introduce multi-level
in-core extent allocations. Although the in-core extent management is
using a new code path in this mod, the functionality remains the same. 
Major changes include:	- Introduce 10 new subroutines which re-orgainze
the existing code but	do NOT change functionality:	    
xfs_iext_get_ext()	   xfs_iext_insert()	     xfs_iext_add()	  
 xfs_iext_remove()	   xfs_iext_remove_inline()	   
xfs_iext_remove_direct()	 xfs_iext_realloc_direct()	  
xfs_iext_direct_to_inline()	    xfs_iext_inline_to_direct()        
xfs_iext_destroy() - Remove 2 subroutines (functionality moved to new
subroutines above):	    xfs_iext_realloc() -replaced by xfs_iext_add()
and xfs_iext_remove()	      xfs_bmap_insert_exlist() - replaced by
xfs_iext_insert()	  xfs_bmap_delete_exlist() - replaced by
xfs_iext_remove() - Replace all hard-coded (indexed) extent assignments
with a call to	 xfs_iext_get_ext() - Replace all extent record pointer
arithmetic (ep++, ep--, base + lastx,..)   with calls to
xfs_iext_get_ext() - Update comments to remove the idea of a single
"extent list" and   introduce "extent record" terminology instead

SGI-PV: 928864
SGI-Modid: xfs-linux-melb:xfs-kern:207390a
Signed-off-by: default avatarMandy Kirkconnell <alkirkco@sgi.com>
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 9f989c94
Show whitespace changes
Inline Side-by-side
Showing with 597 additions and 410 deletions
fs/xfs/quota/xfs_qm.c
View file @ 4eea22f0
...@@ -1704,9 +1704,9 @@ xfs_qm_get_rtblks( ...@@ -1704,9 +1704,9 @@ xfs_qm_get_rtblks(
xfs_qcnt_t *O_rtblks) xfs_qcnt_t *O_rtblks)
{ {
xfs_filblks_t rtblks; /* total rt blks */ xfs_filblks_t rtblks; /* total rt blks */
xfs_extnum_t idx; /* extent record index */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
xfs_extnum_t nextents; /* number of extent entries */ xfs_extnum_t nextents; /* number of extent entries */
xfs_bmbt_rec_t *base; /* base of extent array */
xfs_bmbt_rec_t *ep; /* pointer to an extent entry */ xfs_bmbt_rec_t *ep; /* pointer to an extent entry */
int error; int error;
...@@ -1717,10 +1717,11 @@ xfs_qm_get_rtblks( ...@@ -1717,10 +1717,11 @@ xfs_qm_get_rtblks(
return error; return error;
} }
rtblks = 0; rtblks = 0;
nextents = ifp->if_bytes / sizeof(xfs_bmbt_rec_t); nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
base = &ifp->if_u1.if_extents[0]; for (idx = 0; idx < nextents; idx++) {
for (ep = base; ep < &base[nextents]; ep++) ep = xfs_iext_get_ext(ifp, idx);
rtblks += xfs_bmbt_get_blockcount(ep); rtblks += xfs_bmbt_get_blockcount(ep);
}
*O_rtblks = (xfs_qcnt_t)rtblks; *O_rtblks = (xfs_qcnt_t)rtblks;
return 0; return 0;
} }
......
fs/xfs/xfs_bmap.c
View file @ 4eea22f0
...@@ -89,7 +89,7 @@ xfs_bmap_add_attrfork_local( ...@@ -89,7 +89,7 @@ xfs_bmap_add_attrfork_local(
int *flags); /* inode logging flags */ int *flags); /* inode logging flags */
/* /*
* Called by xfs_bmapi to update extent list structure and the btree * Called by xfs_bmapi to update file extent records and the btree
* after allocating space (or doing a delayed allocation). * after allocating space (or doing a delayed allocation).
*/ */
STATIC int /* error */ STATIC int /* error */
...@@ -97,7 +97,7 @@ xfs_bmap_add_extent( ...@@ -97,7 +97,7 @@ xfs_bmap_add_extent(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ xfs_btree_cur_t **curp, /* if *curp is null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
xfs_fsblock_t *first, /* pointer to firstblock variable */ xfs_fsblock_t *first, /* pointer to firstblock variable */
xfs_bmap_free_t *flist, /* list of extents to be freed */ xfs_bmap_free_t *flist, /* list of extents to be freed */
int *logflagsp, /* inode logging flags */ int *logflagsp, /* inode logging flags */
...@@ -113,7 +113,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -113,7 +113,7 @@ xfs_bmap_add_extent_delay_real(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ xfs_btree_cur_t **curp, /* if *curp is null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
xfs_filblks_t *dnew, /* new delayed-alloc indirect blocks */ xfs_filblks_t *dnew, /* new delayed-alloc indirect blocks */
xfs_fsblock_t *first, /* pointer to firstblock variable */ xfs_fsblock_t *first, /* pointer to firstblock variable */
xfs_bmap_free_t *flist, /* list of extents to be freed */ xfs_bmap_free_t *flist, /* list of extents to be freed */
...@@ -129,7 +129,7 @@ xfs_bmap_add_extent_hole_delay( ...@@ -129,7 +129,7 @@ xfs_bmap_add_extent_hole_delay(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_btree_cur_t *cur, /* if null, not a btree */ xfs_btree_cur_t *cur, /* if null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
int *logflagsp,/* inode logging flags */ int *logflagsp,/* inode logging flags */
int rsvd); /* OK to allocate reserved blocks */ int rsvd); /* OK to allocate reserved blocks */
...@@ -142,7 +142,7 @@ xfs_bmap_add_extent_hole_real( ...@@ -142,7 +142,7 @@ xfs_bmap_add_extent_hole_real(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_btree_cur_t *cur, /* if null, not a btree */ xfs_btree_cur_t *cur, /* if null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
int *logflagsp, /* inode logging flags */ int *logflagsp, /* inode logging flags */
int whichfork); /* data or attr fork */ int whichfork); /* data or attr fork */
...@@ -155,7 +155,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -155,7 +155,7 @@ xfs_bmap_add_extent_unwritten_real(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ xfs_btree_cur_t **curp, /* if *curp is null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
int *logflagsp); /* inode logging flags */ int *logflagsp); /* inode logging flags */
/* /*
...@@ -169,7 +169,7 @@ xfs_bmap_alloc( ...@@ -169,7 +169,7 @@ xfs_bmap_alloc(
/* /*
* Transform a btree format file with only one leaf node, where the * Transform a btree format file with only one leaf node, where the
* extents list will fit in the inode, into an extents format file. * extents list will fit in the inode, into an extents format file.
* Since the extent list is already in-core, all we have to do is * Since the file extents are already in-core, all we have to do is
* give up the space for the btree root and pitch the leaf block. * give up the space for the btree root and pitch the leaf block.
*/ */
STATIC int /* error */ STATIC int /* error */
...@@ -191,7 +191,7 @@ xfs_bmap_check_extents( ...@@ -191,7 +191,7 @@ xfs_bmap_check_extents(
#endif #endif
/* /*
* Called by xfs_bmapi to update extent list structure and the btree * Called by xfs_bmapi to update file extent records and the btree
* after removing space (or undoing a delayed allocation). * after removing space (or undoing a delayed allocation).
*/ */
STATIC int /* error */ STATIC int /* error */
...@@ -201,7 +201,7 @@ xfs_bmap_del_extent( ...@@ -201,7 +201,7 @@ xfs_bmap_del_extent(
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_bmap_free_t *flist, /* list of extents to be freed */ xfs_bmap_free_t *flist, /* list of extents to be freed */
xfs_btree_cur_t *cur, /* if null, not a btree */ xfs_btree_cur_t *cur, /* if null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
int *logflagsp,/* inode logging flags */ int *logflagsp,/* inode logging flags */
int whichfork, /* data or attr fork */ int whichfork, /* data or attr fork */
int rsvd); /* OK to allocate reserved blocks */ int rsvd); /* OK to allocate reserved blocks */
...@@ -216,18 +216,6 @@ xfs_bmap_del_free( ...@@ -216,18 +216,6 @@ xfs_bmap_del_free(
xfs_bmap_free_item_t *prev, /* previous item on list, if any */ xfs_bmap_free_item_t *prev, /* previous item on list, if any */
xfs_bmap_free_item_t *free); /* list item to be freed */ xfs_bmap_free_item_t *free); /* list item to be freed */
/*
* Remove count entries from the extents array for inode "ip", starting
* at index "idx". Copies the remaining items down over the deleted ones,
* and gives back the excess memory.
*/
STATIC void
xfs_bmap_delete_exlist(
xfs_inode_t *ip, /* incode inode pointer */
xfs_extnum_t idx, /* starting delete index */
xfs_extnum_t count, /* count of items to delete */
int whichfork); /* data or attr fork */
/* /*
* Convert an extents-format file into a btree-format file. * Convert an extents-format file into a btree-format file.
* The new file will have a root block (in the inode) and a single child block. * The new file will have a root block (in the inode) and a single child block.
...@@ -243,18 +231,6 @@ xfs_bmap_extents_to_btree( ...@@ -243,18 +231,6 @@ xfs_bmap_extents_to_btree(
int *logflagsp, /* inode logging flags */ int *logflagsp, /* inode logging flags */
int whichfork); /* data or attr fork */ int whichfork); /* data or attr fork */
/*
* Insert new item(s) in the extent list for inode "ip".
* Count new items are inserted at offset idx.
*/
STATIC void
xfs_bmap_insert_exlist(
xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* starting index of new items */
xfs_extnum_t count, /* number of inserted items */
xfs_bmbt_irec_t *new, /* items to insert */
int whichfork); /* data or attr fork */
/* /*
* Convert a local file to an extents file. * Convert a local file to an extents file.
* This code is sort of bogus, since the file data needs to get * This code is sort of bogus, since the file data needs to get
...@@ -316,7 +292,7 @@ xfs_bmap_trace_addentry( ...@@ -316,7 +292,7 @@ xfs_bmap_trace_addentry(
int whichfork); /* data or attr fork */ int whichfork); /* data or attr fork */
/* /*
* Add bmap trace entry prior to a call to xfs_bmap_delete_exlist. * Add bmap trace entry prior to a call to xfs_iext_remove.
*/ */
STATIC void STATIC void
xfs_bmap_trace_delete( xfs_bmap_trace_delete(
...@@ -328,7 +304,7 @@ xfs_bmap_trace_delete( ...@@ -328,7 +304,7 @@ xfs_bmap_trace_delete(
int whichfork); /* data or attr fork */ int whichfork); /* data or attr fork */
/* /*
* Add bmap trace entry prior to a call to xfs_bmap_insert_exlist, or * Add bmap trace entry prior to a call to xfs_iext_insert, or
* reading in the extents list from the disk (in the btree). * reading in the extents list from the disk (in the btree).
*/ */
STATIC void STATIC void
...@@ -343,7 +319,7 @@ xfs_bmap_trace_insert( ...@@ -343,7 +319,7 @@ xfs_bmap_trace_insert(
int whichfork); /* data or attr fork */ int whichfork); /* data or attr fork */
/* /*
* Add bmap trace entry after updating an extent list entry in place. * Add bmap trace entry after updating an extent record in place.
*/ */
STATIC void STATIC void
xfs_bmap_trace_post_update( xfs_bmap_trace_post_update(
...@@ -354,7 +330,7 @@ xfs_bmap_trace_post_update( ...@@ -354,7 +330,7 @@ xfs_bmap_trace_post_update(
int whichfork); /* data or attr fork */ int whichfork); /* data or attr fork */
/* /*
* Add bmap trace entry prior to updating an extent list entry in place. * Add bmap trace entry prior to updating an extent record in place.
*/ */
STATIC void STATIC void
xfs_bmap_trace_pre_update( xfs_bmap_trace_pre_update(
...@@ -413,19 +389,24 @@ STATIC int ...@@ -413,19 +389,24 @@ STATIC int
xfs_bmap_count_tree( xfs_bmap_count_tree(
xfs_mount_t *mp, xfs_mount_t *mp,
xfs_trans_t *tp, xfs_trans_t *tp,
xfs_ifork_t *ifp,
xfs_fsblock_t blockno, xfs_fsblock_t blockno,
int levelin, int levelin,
int *count); int *count);
STATIC int STATIC int
xfs_bmap_count_leaves( xfs_bmap_count_leaves(
xfs_bmbt_rec_t *frp, xfs_ifork_t *ifp,
xfs_extnum_t idx,
int numrecs, int numrecs,
int *count); int *count);
STATIC int STATIC int
xfs_bmap_disk_count_leaves( xfs_bmap_disk_count_leaves(
xfs_bmbt_rec_t *frp, xfs_ifork_t *ifp,
xfs_mount_t *mp,
xfs_extnum_t idx,
xfs_bmbt_block_t *block,
int numrecs, int numrecs,
int *count); int *count);
...@@ -537,7 +518,7 @@ xfs_bmap_add_attrfork_local( ...@@ -537,7 +518,7 @@ xfs_bmap_add_attrfork_local(
} }
/* /*
* Called by xfs_bmapi to update extent list structure and the btree * Called by xfs_bmapi to update file extent records and the btree
* after allocating space (or doing a delayed allocation). * after allocating space (or doing a delayed allocation).
*/ */
STATIC int /* error */ STATIC int /* error */
...@@ -545,7 +526,7 @@ xfs_bmap_add_extent( ...@@ -545,7 +526,7 @@ xfs_bmap_add_extent(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ xfs_btree_cur_t **curp, /* if *curp is null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
xfs_fsblock_t *first, /* pointer to firstblock variable */ xfs_fsblock_t *first, /* pointer to firstblock variable */
xfs_bmap_free_t *flist, /* list of extents to be freed */ xfs_bmap_free_t *flist, /* list of extents to be freed */
int *logflagsp, /* inode logging flags */ int *logflagsp, /* inode logging flags */
...@@ -578,7 +559,7 @@ xfs_bmap_add_extent( ...@@ -578,7 +559,7 @@ xfs_bmap_add_extent(
if (nextents == 0) { if (nextents == 0) {
xfs_bmap_trace_insert(fname, "insert empty", ip, 0, 1, new, xfs_bmap_trace_insert(fname, "insert empty", ip, 0, 1, new,
NULL, whichfork); NULL, whichfork);
xfs_bmap_insert_exlist(ip, 0, 1, new, whichfork); xfs_iext_insert(ifp, 0, 1, new);
ASSERT(cur == NULL); ASSERT(cur == NULL);
ifp->if_lastex = 0; ifp->if_lastex = 0;
if (!ISNULLSTARTBLOCK(new->br_startblock)) { if (!ISNULLSTARTBLOCK(new->br_startblock)) {
...@@ -614,7 +595,7 @@ xfs_bmap_add_extent( ...@@ -614,7 +595,7 @@ xfs_bmap_add_extent(
/* /*
* Get the record referred to by idx. * Get the record referred to by idx.
*/ */
xfs_bmbt_get_all(&ifp->if_u1.if_extents[idx], &prev); xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx), &prev);
/* /*
* If it's a real allocation record, and the new allocation ends * If it's a real allocation record, and the new allocation ends
* after the start of the referred to record, then we're filling * after the start of the referred to record, then we're filling
...@@ -714,14 +695,13 @@ xfs_bmap_add_extent_delay_real( ...@@ -714,14 +695,13 @@ xfs_bmap_add_extent_delay_real(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ xfs_btree_cur_t **curp, /* if *curp is null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
xfs_filblks_t *dnew, /* new delayed-alloc indirect blocks */ xfs_filblks_t *dnew, /* new delayed-alloc indirect blocks */
xfs_fsblock_t *first, /* pointer to firstblock variable */ xfs_fsblock_t *first, /* pointer to firstblock variable */
xfs_bmap_free_t *flist, /* list of extents to be freed */ xfs_bmap_free_t *flist, /* list of extents to be freed */
int *logflagsp, /* inode logging flags */ int *logflagsp, /* inode logging flags */
int rsvd) /* OK to use reserved data block allocation */ int rsvd) /* OK to use reserved data block allocation */
{ {
xfs_bmbt_rec_t *base; /* base of extent entry list */
xfs_btree_cur_t *cur; /* btree cursor */ xfs_btree_cur_t *cur; /* btree cursor */
int diff; /* temp value */ int diff; /* temp value */
xfs_bmbt_rec_t *ep; /* extent entry for idx */ xfs_bmbt_rec_t *ep; /* extent entry for idx */
...@@ -730,6 +710,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -730,6 +710,7 @@ xfs_bmap_add_extent_delay_real(
static char fname[] = "xfs_bmap_add_extent_delay_real"; static char fname[] = "xfs_bmap_add_extent_delay_real";
#endif #endif
int i; /* temp state */ int i; /* temp state */
xfs_ifork_t *ifp; /* inode fork pointer */
xfs_fileoff_t new_endoff; /* end offset of new entry */ xfs_fileoff_t new_endoff; /* end offset of new entry */
xfs_bmbt_irec_t r[3]; /* neighbor extent entries */ xfs_bmbt_irec_t r[3]; /* neighbor extent entries */
/* left is 0, right is 1, prev is 2 */ /* left is 0, right is 1, prev is 2 */
...@@ -763,8 +744,8 @@ xfs_bmap_add_extent_delay_real( ...@@ -763,8 +744,8 @@ xfs_bmap_add_extent_delay_real(
* Set up a bunch of variables to make the tests simpler. * Set up a bunch of variables to make the tests simpler.
*/ */
cur = *curp; cur = *curp;
base = ip->i_df.if_u1.if_extents; ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);
ep = &base[idx]; ep = xfs_iext_get_ext(ifp, idx);
xfs_bmbt_get_all(ep, &PREV); xfs_bmbt_get_all(ep, &PREV);
new_endoff = new->br_startoff + new->br_blockcount; new_endoff = new->br_startoff + new->br_blockcount;
ASSERT(PREV.br_startoff <= new->br_startoff); ASSERT(PREV.br_startoff <= new->br_startoff);
...@@ -781,7 +762,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -781,7 +762,7 @@ xfs_bmap_add_extent_delay_real(
* Don't set contiguous if the combined extent would be too large. * Don't set contiguous if the combined extent would be too large.
*/ */
if (STATE_SET_TEST(LEFT_VALID, idx > 0)) { if (STATE_SET_TEST(LEFT_VALID, idx > 0)) {
xfs_bmbt_get_all(ep - 1, &LEFT); xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx - 1), &LEFT);
STATE_SET(LEFT_DELAY, ISNULLSTARTBLOCK(LEFT.br_startblock)); STATE_SET(LEFT_DELAY, ISNULLSTARTBLOCK(LEFT.br_startblock));
} }
STATE_SET(LEFT_CONTIG, STATE_SET(LEFT_CONTIG,
...@@ -798,7 +779,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -798,7 +779,7 @@ xfs_bmap_add_extent_delay_real(
if (STATE_SET_TEST(RIGHT_VALID, if (STATE_SET_TEST(RIGHT_VALID,
idx < idx <
ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t) - 1)) { ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t) - 1)) {
xfs_bmbt_get_all(ep + 1, &RIGHT); xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx + 1), &RIGHT);
STATE_SET(RIGHT_DELAY, ISNULLSTARTBLOCK(RIGHT.br_startblock)); STATE_SET(RIGHT_DELAY, ISNULLSTARTBLOCK(RIGHT.br_startblock));
} }
STATE_SET(RIGHT_CONTIG, STATE_SET(RIGHT_CONTIG,
...@@ -825,14 +806,14 @@ xfs_bmap_add_extent_delay_real( ...@@ -825,14 +806,14 @@ xfs_bmap_add_extent_delay_real(
*/ */
xfs_bmap_trace_pre_update(fname, "LF|RF|LC|RC", ip, idx - 1, xfs_bmap_trace_pre_update(fname, "LF|RF|LC|RC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_blockcount(ep - 1, xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
LEFT.br_blockcount + PREV.br_blockcount + LEFT.br_blockcount + PREV.br_blockcount +
RIGHT.br_blockcount); RIGHT.br_blockcount);
xfs_bmap_trace_post_update(fname, "LF|RF|LC|RC", ip, idx - 1, xfs_bmap_trace_post_update(fname, "LF|RF|LC|RC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_trace_delete(fname, "LF|RF|LC|RC", ip, idx, 2, xfs_bmap_trace_delete(fname, "LF|RF|LC|RC", ip, idx, 2,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_delete_exlist(ip, idx, 2, XFS_DATA_FORK); xfs_iext_remove(ifp, idx, 2);
ip->i_df.if_lastex = idx - 1; ip->i_df.if_lastex = idx - 1;
ip->i_d.di_nextents--; ip->i_d.di_nextents--;
if (cur == NULL) if (cur == NULL)
...@@ -867,14 +848,14 @@ xfs_bmap_add_extent_delay_real( ...@@ -867,14 +848,14 @@ xfs_bmap_add_extent_delay_real(
*/ */
xfs_bmap_trace_pre_update(fname, "LF|RF|LC", ip, idx - 1, xfs_bmap_trace_pre_update(fname, "LF|RF|LC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_blockcount(ep - 1, xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
LEFT.br_blockcount + PREV.br_blockcount); LEFT.br_blockcount + PREV.br_blockcount);
xfs_bmap_trace_post_update(fname, "LF|RF|LC", ip, idx - 1, xfs_bmap_trace_post_update(fname, "LF|RF|LC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
ip->i_df.if_lastex = idx - 1; ip->i_df.if_lastex = idx - 1;
xfs_bmap_trace_delete(fname, "LF|RF|LC", ip, idx, 1, xfs_bmap_trace_delete(fname, "LF|RF|LC", ip, idx, 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_delete_exlist(ip, idx, 1, XFS_DATA_FORK); xfs_iext_remove(ifp, idx, 1);
if (cur == NULL) if (cur == NULL)
rval = XFS_ILOG_DEXT; rval = XFS_ILOG_DEXT;
else { else {
...@@ -908,7 +889,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -908,7 +889,7 @@ xfs_bmap_add_extent_delay_real(
ip->i_df.if_lastex = idx; ip->i_df.if_lastex = idx;
xfs_bmap_trace_delete(fname, "LF|RF|RC", ip, idx + 1, 1, xfs_bmap_trace_delete(fname, "LF|RF|RC", ip, idx + 1, 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_delete_exlist(ip, idx + 1, 1, XFS_DATA_FORK); xfs_iext_remove(ifp, idx + 1, 1);
if (cur == NULL) if (cur == NULL)
rval = XFS_ILOG_DEXT; rval = XFS_ILOG_DEXT;
else { else {
...@@ -964,7 +945,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -964,7 +945,7 @@ xfs_bmap_add_extent_delay_real(
*/ */
xfs_bmap_trace_pre_update(fname, "LF|LC", ip, idx - 1, xfs_bmap_trace_pre_update(fname, "LF|LC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_blockcount(ep - 1, xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
LEFT.br_blockcount + new->br_blockcount); LEFT.br_blockcount + new->br_blockcount);
xfs_bmbt_set_startoff(ep, xfs_bmbt_set_startoff(ep,
PREV.br_startoff + new->br_blockcount); PREV.br_startoff + new->br_blockcount);
...@@ -1010,7 +991,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -1010,7 +991,7 @@ xfs_bmap_add_extent_delay_real(
xfs_bmbt_set_blockcount(ep, temp); xfs_bmbt_set_blockcount(ep, temp);
xfs_bmap_trace_insert(fname, "LF", ip, idx, 1, new, NULL, xfs_bmap_trace_insert(fname, "LF", ip, idx, 1, new, NULL,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_insert_exlist(ip, idx, 1, new, XFS_DATA_FORK); xfs_iext_insert(ifp, idx, 1, new);
ip->i_df.if_lastex = idx; ip->i_df.if_lastex = idx;
ip->i_d.di_nextents++; ip->i_d.di_nextents++;
if (cur == NULL) if (cur == NULL)
...@@ -1039,8 +1020,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -1039,8 +1020,7 @@ xfs_bmap_add_extent_delay_real(
temp = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp), temp = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp),
STARTBLOCKVAL(PREV.br_startblock) - STARTBLOCKVAL(PREV.br_startblock) -
(cur ? cur->bc_private.b.allocated : 0)); (cur ? cur->bc_private.b.allocated : 0));
base = ip->i_df.if_u1.if_extents; ep = xfs_iext_get_ext(ifp, idx + 1);
ep = &base[idx + 1];
xfs_bmbt_set_startblock(ep, NULLSTARTBLOCK((int)temp)); xfs_bmbt_set_startblock(ep, NULLSTARTBLOCK((int)temp));
xfs_bmap_trace_post_update(fname, "LF", ip, idx + 1, xfs_bmap_trace_post_update(fname, "LF", ip, idx + 1,
XFS_DATA_FORK); XFS_DATA_FORK);
...@@ -1058,7 +1038,8 @@ xfs_bmap_add_extent_delay_real( ...@@ -1058,7 +1038,8 @@ xfs_bmap_add_extent_delay_real(
xfs_bmap_trace_pre_update(fname, "RF|RC", ip, idx + 1, xfs_bmap_trace_pre_update(fname, "RF|RC", ip, idx + 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_blockcount(ep, temp); xfs_bmbt_set_blockcount(ep, temp);
xfs_bmbt_set_allf(ep + 1, new->br_startoff, new->br_startblock, xfs_bmbt_set_allf(xfs_iext_get_ext(ifp, idx + 1),
new->br_startoff, new->br_startblock,
new->br_blockcount + RIGHT.br_blockcount, new->br_blockcount + RIGHT.br_blockcount,
RIGHT.br_state); RIGHT.br_state);
xfs_bmap_trace_post_update(fname, "RF|RC", ip, idx + 1, xfs_bmap_trace_post_update(fname, "RF|RC", ip, idx + 1,
...@@ -1098,7 +1079,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -1098,7 +1079,7 @@ xfs_bmap_add_extent_delay_real(
xfs_bmbt_set_blockcount(ep, temp); xfs_bmbt_set_blockcount(ep, temp);
xfs_bmap_trace_insert(fname, "RF", ip, idx + 1, 1, xfs_bmap_trace_insert(fname, "RF", ip, idx + 1, 1,
new, NULL, XFS_DATA_FORK); new, NULL, XFS_DATA_FORK);
xfs_bmap_insert_exlist(ip, idx + 1, 1, new, XFS_DATA_FORK); xfs_iext_insert(ifp, idx + 1, 1, new);
ip->i_df.if_lastex = idx + 1; ip->i_df.if_lastex = idx + 1;
ip->i_d.di_nextents++; ip->i_d.di_nextents++;
if (cur == NULL) if (cur == NULL)
...@@ -1127,8 +1108,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -1127,8 +1108,7 @@ xfs_bmap_add_extent_delay_real(
temp = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp), temp = XFS_FILBLKS_MIN(xfs_bmap_worst_indlen(ip, temp),
STARTBLOCKVAL(PREV.br_startblock) - STARTBLOCKVAL(PREV.br_startblock) -
(cur ? cur->bc_private.b.allocated : 0)); (cur ? cur->bc_private.b.allocated : 0));
base = ip->i_df.if_u1.if_extents; ep = xfs_iext_get_ext(ifp, idx);
ep = &base[idx];
xfs_bmbt_set_startblock(ep, NULLSTARTBLOCK((int)temp)); xfs_bmbt_set_startblock(ep, NULLSTARTBLOCK((int)temp));
xfs_bmap_trace_post_update(fname, "RF", ip, idx, XFS_DATA_FORK); xfs_bmap_trace_post_update(fname, "RF", ip, idx, XFS_DATA_FORK);
*dnew = temp; *dnew = temp;
...@@ -1149,7 +1129,7 @@ xfs_bmap_add_extent_delay_real( ...@@ -1149,7 +1129,7 @@ xfs_bmap_add_extent_delay_real(
r[1].br_blockcount = temp2; r[1].br_blockcount = temp2;
xfs_bmap_trace_insert(fname, "0", ip, idx + 1, 2, &r[0], &r[1], xfs_bmap_trace_insert(fname, "0", ip, idx + 1, 2, &r[0], &r[1],
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_insert_exlist(ip, idx + 1, 2, &r[0], XFS_DATA_FORK); xfs_iext_insert(ifp, idx + 1, 2, &r[0]);
ip->i_df.if_lastex = idx + 1; ip->i_df.if_lastex = idx + 1;
ip->i_d.di_nextents++; ip->i_d.di_nextents++;
if (cur == NULL) if (cur == NULL)
...@@ -1204,13 +1184,13 @@ xfs_bmap_add_extent_delay_real( ...@@ -1204,13 +1184,13 @@ xfs_bmap_add_extent_delay_real(
} }
} }
} }
base = ip->i_df.if_u1.if_extents; ep = xfs_iext_get_ext(ifp, idx);
ep = &base[idx];
xfs_bmbt_set_startblock(ep, NULLSTARTBLOCK((int)temp)); xfs_bmbt_set_startblock(ep, NULLSTARTBLOCK((int)temp));
xfs_bmap_trace_post_update(fname, "0", ip, idx, XFS_DATA_FORK); xfs_bmap_trace_post_update(fname, "0", ip, idx, XFS_DATA_FORK);
xfs_bmap_trace_pre_update(fname, "0", ip, idx + 2, xfs_bmap_trace_pre_update(fname, "0", ip, idx + 2,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_startblock(ep + 2, NULLSTARTBLOCK((int)temp2)); xfs_bmbt_set_startblock(xfs_iext_get_ext(ifp, idx + 2),
NULLSTARTBLOCK((int)temp2));
xfs_bmap_trace_post_update(fname, "0", ip, idx + 2, xfs_bmap_trace_post_update(fname, "0", ip, idx + 2,
XFS_DATA_FORK); XFS_DATA_FORK);
*dnew = temp + temp2; *dnew = temp + temp2;
...@@ -1254,10 +1234,9 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1254,10 +1234,9 @@ xfs_bmap_add_extent_unwritten_real(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_btree_cur_t **curp, /* if *curp is null, not a btree */ xfs_btree_cur_t **curp, /* if *curp is null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
int *logflagsp) /* inode logging flags */ int *logflagsp) /* inode logging flags */
{ {
xfs_bmbt_rec_t *base; /* base of extent entry list */
xfs_btree_cur_t *cur; /* btree cursor */ xfs_btree_cur_t *cur; /* btree cursor */
xfs_bmbt_rec_t *ep; /* extent entry for idx */ xfs_bmbt_rec_t *ep; /* extent entry for idx */
int error; /* error return value */ int error; /* error return value */
...@@ -1265,6 +1244,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1265,6 +1244,7 @@ xfs_bmap_add_extent_unwritten_real(
static char fname[] = "xfs_bmap_add_extent_unwritten_real"; static char fname[] = "xfs_bmap_add_extent_unwritten_real";
#endif #endif
int i; /* temp state */ int i; /* temp state */
xfs_ifork_t *ifp; /* inode fork pointer */
xfs_fileoff_t new_endoff; /* end offset of new entry */ xfs_fileoff_t new_endoff; /* end offset of new entry */
xfs_exntst_t newext; /* new extent state */ xfs_exntst_t newext; /* new extent state */
xfs_exntst_t oldext; /* old extent state */ xfs_exntst_t oldext; /* old extent state */
...@@ -1298,8 +1278,8 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1298,8 +1278,8 @@ xfs_bmap_add_extent_unwritten_real(
*/ */
error = 0; error = 0;
cur = *curp; cur = *curp;
base = ip->i_df.if_u1.if_extents; ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);
ep = &base[idx]; ep = xfs_iext_get_ext(ifp, idx);
xfs_bmbt_get_all(ep, &PREV); xfs_bmbt_get_all(ep, &PREV);
newext = new->br_state; newext = new->br_state;
oldext = (newext == XFS_EXT_UNWRITTEN) ? oldext = (newext == XFS_EXT_UNWRITTEN) ?
...@@ -1320,7 +1300,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1320,7 +1300,7 @@ xfs_bmap_add_extent_unwritten_real(
* Don't set contiguous if the combined extent would be too large. * Don't set contiguous if the combined extent would be too large.
*/ */
if (STATE_SET_TEST(LEFT_VALID, idx > 0)) { if (STATE_SET_TEST(LEFT_VALID, idx > 0)) {
xfs_bmbt_get_all(ep - 1, &LEFT); xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx - 1), &LEFT);
STATE_SET(LEFT_DELAY, ISNULLSTARTBLOCK(LEFT.br_startblock)); STATE_SET(LEFT_DELAY, ISNULLSTARTBLOCK(LEFT.br_startblock));
} }
STATE_SET(LEFT_CONTIG, STATE_SET(LEFT_CONTIG,
...@@ -1337,7 +1317,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1337,7 +1317,7 @@ xfs_bmap_add_extent_unwritten_real(
if (STATE_SET_TEST(RIGHT_VALID, if (STATE_SET_TEST(RIGHT_VALID,
idx < idx <
ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t) - 1)) { ip->i_df.if_bytes / (uint)sizeof(xfs_bmbt_rec_t) - 1)) {
xfs_bmbt_get_all(ep + 1, &RIGHT); xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx + 1), &RIGHT);
STATE_SET(RIGHT_DELAY, ISNULLSTARTBLOCK(RIGHT.br_startblock)); STATE_SET(RIGHT_DELAY, ISNULLSTARTBLOCK(RIGHT.br_startblock));
} }
STATE_SET(RIGHT_CONTIG, STATE_SET(RIGHT_CONTIG,
...@@ -1363,14 +1343,14 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1363,14 +1343,14 @@ xfs_bmap_add_extent_unwritten_real(
*/ */
xfs_bmap_trace_pre_update(fname, "LF|RF|LC|RC", ip, idx - 1, xfs_bmap_trace_pre_update(fname, "LF|RF|LC|RC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_blockcount(ep - 1, xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
LEFT.br_blockcount + PREV.br_blockcount + LEFT.br_blockcount + PREV.br_blockcount +
RIGHT.br_blockcount); RIGHT.br_blockcount);
xfs_bmap_trace_post_update(fname, "LF|RF|LC|RC", ip, idx - 1, xfs_bmap_trace_post_update(fname, "LF|RF|LC|RC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_trace_delete(fname, "LF|RF|LC|RC", ip, idx, 2, xfs_bmap_trace_delete(fname, "LF|RF|LC|RC", ip, idx, 2,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_delete_exlist(ip, idx, 2, XFS_DATA_FORK); xfs_iext_remove(ifp, idx, 2);
ip->i_df.if_lastex = idx - 1; ip->i_df.if_lastex = idx - 1;
ip->i_d.di_nextents -= 2; ip->i_d.di_nextents -= 2;
if (cur == NULL) if (cur == NULL)
...@@ -1409,14 +1389,14 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1409,14 +1389,14 @@ xfs_bmap_add_extent_unwritten_real(
*/ */
xfs_bmap_trace_pre_update(fname, "LF|RF|LC", ip, idx - 1, xfs_bmap_trace_pre_update(fname, "LF|RF|LC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_blockcount(ep - 1, xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
LEFT.br_blockcount + PREV.br_blockcount); LEFT.br_blockcount + PREV.br_blockcount);
xfs_bmap_trace_post_update(fname, "LF|RF|LC", ip, idx - 1, xfs_bmap_trace_post_update(fname, "LF|RF|LC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
ip->i_df.if_lastex = idx - 1; ip->i_df.if_lastex = idx - 1;
xfs_bmap_trace_delete(fname, "LF|RF|LC", ip, idx, 1, xfs_bmap_trace_delete(fname, "LF|RF|LC", ip, idx, 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_delete_exlist(ip, idx, 1, XFS_DATA_FORK); xfs_iext_remove(ifp, idx, 1);
ip->i_d.di_nextents--; ip->i_d.di_nextents--;
if (cur == NULL) if (cur == NULL)
rval = XFS_ILOG_CORE | XFS_ILOG_DEXT; rval = XFS_ILOG_CORE | XFS_ILOG_DEXT;
...@@ -1456,7 +1436,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1456,7 +1436,7 @@ xfs_bmap_add_extent_unwritten_real(
ip->i_df.if_lastex = idx; ip->i_df.if_lastex = idx;
xfs_bmap_trace_delete(fname, "LF|RF|RC", ip, idx + 1, 1, xfs_bmap_trace_delete(fname, "LF|RF|RC", ip, idx + 1, 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_delete_exlist(ip, idx + 1, 1, XFS_DATA_FORK); xfs_iext_remove(ifp, idx + 1, 1);
ip->i_d.di_nextents--; ip->i_d.di_nextents--;
if (cur == NULL) if (cur == NULL)
rval = XFS_ILOG_CORE | XFS_ILOG_DEXT; rval = XFS_ILOG_CORE | XFS_ILOG_DEXT;
...@@ -1516,7 +1496,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1516,7 +1496,7 @@ xfs_bmap_add_extent_unwritten_real(
*/ */
xfs_bmap_trace_pre_update(fname, "LF|LC", ip, idx - 1, xfs_bmap_trace_pre_update(fname, "LF|LC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_blockcount(ep - 1, xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
LEFT.br_blockcount + new->br_blockcount); LEFT.br_blockcount + new->br_blockcount);
xfs_bmbt_set_startoff(ep, xfs_bmbt_set_startoff(ep,
PREV.br_startoff + new->br_blockcount); PREV.br_startoff + new->br_blockcount);
...@@ -1571,7 +1551,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1571,7 +1551,7 @@ xfs_bmap_add_extent_unwritten_real(
xfs_bmap_trace_post_update(fname, "LF", ip, idx, XFS_DATA_FORK); xfs_bmap_trace_post_update(fname, "LF", ip, idx, XFS_DATA_FORK);
xfs_bmap_trace_insert(fname, "LF", ip, idx, 1, new, NULL, xfs_bmap_trace_insert(fname, "LF", ip, idx, 1, new, NULL,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_insert_exlist(ip, idx, 1, new, XFS_DATA_FORK); xfs_iext_insert(ifp, idx, 1, new);
ip->i_df.if_lastex = idx; ip->i_df.if_lastex = idx;
ip->i_d.di_nextents++; ip->i_d.di_nextents++;
if (cur == NULL) if (cur == NULL)
...@@ -1609,7 +1589,8 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1609,7 +1589,8 @@ xfs_bmap_add_extent_unwritten_real(
PREV.br_blockcount - new->br_blockcount); PREV.br_blockcount - new->br_blockcount);
xfs_bmap_trace_post_update(fname, "RF|RC", ip, idx, xfs_bmap_trace_post_update(fname, "RF|RC", ip, idx,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_allf(ep + 1, new->br_startoff, new->br_startblock, xfs_bmbt_set_allf(xfs_iext_get_ext(ifp, idx + 1),
new->br_startoff, new->br_startblock,
new->br_blockcount + RIGHT.br_blockcount, newext); new->br_blockcount + RIGHT.br_blockcount, newext);
xfs_bmap_trace_post_update(fname, "RF|RC", ip, idx + 1, xfs_bmap_trace_post_update(fname, "RF|RC", ip, idx + 1,
XFS_DATA_FORK); XFS_DATA_FORK);
...@@ -1649,7 +1630,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1649,7 +1630,7 @@ xfs_bmap_add_extent_unwritten_real(
xfs_bmap_trace_post_update(fname, "RF", ip, idx, XFS_DATA_FORK); xfs_bmap_trace_post_update(fname, "RF", ip, idx, XFS_DATA_FORK);
xfs_bmap_trace_insert(fname, "RF", ip, idx + 1, 1, xfs_bmap_trace_insert(fname, "RF", ip, idx + 1, 1,
new, NULL, XFS_DATA_FORK); new, NULL, XFS_DATA_FORK);
xfs_bmap_insert_exlist(ip, idx + 1, 1, new, XFS_DATA_FORK); xfs_iext_insert(ifp, idx + 1, 1, new);
ip->i_df.if_lastex = idx + 1; ip->i_df.if_lastex = idx + 1;
ip->i_d.di_nextents++; ip->i_d.di_nextents++;
if (cur == NULL) if (cur == NULL)
...@@ -1696,7 +1677,7 @@ xfs_bmap_add_extent_unwritten_real( ...@@ -1696,7 +1677,7 @@ xfs_bmap_add_extent_unwritten_real(
r[1].br_state = oldext; r[1].br_state = oldext;
xfs_bmap_trace_insert(fname, "0", ip, idx + 1, 2, &r[0], &r[1], xfs_bmap_trace_insert(fname, "0", ip, idx + 1, 2, &r[0], &r[1],
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_insert_exlist(ip, idx + 1, 2, &r[0], XFS_DATA_FORK); xfs_iext_insert(ifp, idx + 1, 2, &r[0]);
ip->i_df.if_lastex = idx + 1; ip->i_df.if_lastex = idx + 1;
ip->i_d.di_nextents += 2; ip->i_d.di_nextents += 2;
if (cur == NULL) if (cur == NULL)
...@@ -1770,15 +1751,15 @@ xfs_bmap_add_extent_hole_delay( ...@@ -1770,15 +1751,15 @@ xfs_bmap_add_extent_hole_delay(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_btree_cur_t *cur, /* if null, not a btree */ xfs_btree_cur_t *cur, /* if null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
int *logflagsp, /* inode logging flags */ int *logflagsp, /* inode logging flags */
int rsvd) /* OK to allocate reserved blocks */ int rsvd) /* OK to allocate reserved blocks */
{ {
xfs_bmbt_rec_t *base; /* base of extent entry list */ xfs_bmbt_rec_t *ep; /* extent record for idx */
xfs_bmbt_rec_t *ep; /* extent list entry for idx */
#ifdef XFS_BMAP_TRACE #ifdef XFS_BMAP_TRACE
static char fname[] = "xfs_bmap_add_extent_hole_delay"; static char fname[] = "xfs_bmap_add_extent_hole_delay";
#endif #endif
xfs_ifork_t *ifp; /* inode fork pointer */
xfs_bmbt_irec_t left; /* left neighbor extent entry */ xfs_bmbt_irec_t left; /* left neighbor extent entry */
xfs_filblks_t newlen=0; /* new indirect size */ xfs_filblks_t newlen=0; /* new indirect size */
xfs_filblks_t oldlen=0; /* old indirect size */ xfs_filblks_t oldlen=0; /* old indirect size */
...@@ -1799,15 +1780,15 @@ xfs_bmap_add_extent_hole_delay( ...@@ -1799,15 +1780,15 @@ xfs_bmap_add_extent_hole_delay(
((state &= ~MASK(b)), 0)) ((state &= ~MASK(b)), 0))
#define SWITCH_STATE (state & MASK2(LEFT_CONTIG, RIGHT_CONTIG)) #define SWITCH_STATE (state & MASK2(LEFT_CONTIG, RIGHT_CONTIG))
base = ip->i_df.if_u1.if_extents; ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);
ep = &base[idx]; ep = xfs_iext_get_ext(ifp, idx);
state = 0; state = 0;
ASSERT(ISNULLSTARTBLOCK(new->br_startblock)); ASSERT(ISNULLSTARTBLOCK(new->br_startblock));
/* /*
* Check and set flags if this segment has a left neighbor * Check and set flags if this segment has a left neighbor
*/ */
if (STATE_SET_TEST(LEFT_VALID, idx > 0)) { if (STATE_SET_TEST(LEFT_VALID, idx > 0)) {
xfs_bmbt_get_all(ep - 1, &left); xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx - 1), &left);
STATE_SET(LEFT_DELAY, ISNULLSTARTBLOCK(left.br_startblock)); STATE_SET(LEFT_DELAY, ISNULLSTARTBLOCK(left.br_startblock));
} }
/* /*
...@@ -1844,23 +1825,24 @@ xfs_bmap_add_extent_hole_delay( ...@@ -1844,23 +1825,24 @@ xfs_bmap_add_extent_hole_delay(
/* /*
* New allocation is contiguous with delayed allocations * New allocation is contiguous with delayed allocations
* on the left and on the right. * on the left and on the right.
* Merge all three into a single extent list entry. * Merge all three into a single extent record.
*/ */
temp = left.br_blockcount + new->br_blockcount + temp = left.br_blockcount + new->br_blockcount +
right.br_blockcount; right.br_blockcount;
xfs_bmap_trace_pre_update(fname, "LC|RC", ip, idx - 1, xfs_bmap_trace_pre_update(fname, "LC|RC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_blockcount(ep - 1, temp); xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1), temp);
oldlen = STARTBLOCKVAL(left.br_startblock) + oldlen = STARTBLOCKVAL(left.br_startblock) +
STARTBLOCKVAL(new->br_startblock) + STARTBLOCKVAL(new->br_startblock) +
STARTBLOCKVAL(right.br_startblock); STARTBLOCKVAL(right.br_startblock);
newlen = xfs_bmap_worst_indlen(ip, temp); newlen = xfs_bmap_worst_indlen(ip, temp);
xfs_bmbt_set_startblock(ep - 1, NULLSTARTBLOCK((int)newlen)); xfs_bmbt_set_startblock(xfs_iext_get_ext(ifp, idx - 1),
NULLSTARTBLOCK((int)newlen));
xfs_bmap_trace_post_update(fname, "LC|RC", ip, idx - 1, xfs_bmap_trace_post_update(fname, "LC|RC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_trace_delete(fname, "LC|RC", ip, idx, 1, xfs_bmap_trace_delete(fname, "LC|RC", ip, idx, 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_delete_exlist(ip, idx, 1, XFS_DATA_FORK); xfs_iext_remove(ifp, idx, 1);
ip->i_df.if_lastex = idx - 1; ip->i_df.if_lastex = idx - 1;
break; break;
...@@ -1873,11 +1855,12 @@ xfs_bmap_add_extent_hole_delay( ...@@ -1873,11 +1855,12 @@ xfs_bmap_add_extent_hole_delay(
temp = left.br_blockcount + new->br_blockcount; temp = left.br_blockcount + new->br_blockcount;
xfs_bmap_trace_pre_update(fname, "LC", ip, idx - 1, xfs_bmap_trace_pre_update(fname, "LC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmbt_set_blockcount(ep - 1, temp); xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1), temp);
oldlen = STARTBLOCKVAL(left.br_startblock) + oldlen = STARTBLOCKVAL(left.br_startblock) +
STARTBLOCKVAL(new->br_startblock); STARTBLOCKVAL(new->br_startblock);
newlen = xfs_bmap_worst_indlen(ip, temp); newlen = xfs_bmap_worst_indlen(ip, temp);
xfs_bmbt_set_startblock(ep - 1, NULLSTARTBLOCK((int)newlen)); xfs_bmbt_set_startblock(xfs_iext_get_ext(ifp, idx - 1),
NULLSTARTBLOCK((int)newlen));
xfs_bmap_trace_post_update(fname, "LC", ip, idx - 1, xfs_bmap_trace_post_update(fname, "LC", ip, idx - 1,
XFS_DATA_FORK); XFS_DATA_FORK);
ip->i_df.if_lastex = idx - 1; ip->i_df.if_lastex = idx - 1;
...@@ -1909,7 +1892,7 @@ xfs_bmap_add_extent_hole_delay( ...@@ -1909,7 +1892,7 @@ xfs_bmap_add_extent_hole_delay(
oldlen = newlen = 0; oldlen = newlen = 0;
xfs_bmap_trace_insert(fname, "0", ip, idx, 1, new, NULL, xfs_bmap_trace_insert(fname, "0", ip, idx, 1, new, NULL,
XFS_DATA_FORK); XFS_DATA_FORK);
xfs_bmap_insert_exlist(ip, idx, 1, new, XFS_DATA_FORK); xfs_iext_insert(ifp, idx, 1, new);
ip->i_df.if_lastex = idx; ip->i_df.if_lastex = idx;
break; break;
} }
...@@ -1940,7 +1923,7 @@ xfs_bmap_add_extent_hole_real( ...@@ -1940,7 +1923,7 @@ xfs_bmap_add_extent_hole_real(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* extent number to update/insert */ xfs_extnum_t idx, /* extent number to update/insert */
xfs_btree_cur_t *cur, /* if null, not a btree */ xfs_btree_cur_t *cur, /* if null, not a btree */
xfs_bmbt_irec_t *new, /* new data to put in extent list */ xfs_bmbt_irec_t *new, /* new data to add to file extents */
int *logflagsp, /* inode logging flags */ int *logflagsp, /* inode logging flags */
int whichfork) /* data or attr fork */ int whichfork) /* data or attr fork */
{ {
...@@ -1970,13 +1953,13 @@ xfs_bmap_add_extent_hole_real( ...@@ -1970,13 +1953,13 @@ xfs_bmap_add_extent_hole_real(
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
ASSERT(idx <= ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t)); ASSERT(idx <= ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t));
ep = &ifp->if_u1.if_extents[idx]; ep = xfs_iext_get_ext(ifp, idx);
state = 0; state = 0;
/* /*
* Check and set flags if this segment has a left neighbor. * Check and set flags if this segment has a left neighbor.
*/ */
if (STATE_SET_TEST(LEFT_VALID, idx > 0)) { if (STATE_SET_TEST(LEFT_VALID, idx > 0)) {
xfs_bmbt_get_all(ep - 1, &left); xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx - 1), &left);
STATE_SET(LEFT_DELAY, ISNULLSTARTBLOCK(left.br_startblock)); STATE_SET(LEFT_DELAY, ISNULLSTARTBLOCK(left.br_startblock));
} }
/* /*
...@@ -2019,18 +2002,18 @@ xfs_bmap_add_extent_hole_real( ...@@ -2019,18 +2002,18 @@ xfs_bmap_add_extent_hole_real(
/* /*
* New allocation is contiguous with real allocations on the * New allocation is contiguous with real allocations on the
* left and on the right. * left and on the right.
* Merge all three into a single extent list entry. * Merge all three into a single extent record.
*/ */
xfs_bmap_trace_pre_update(fname, "LC|RC", ip, idx - 1, xfs_bmap_trace_pre_update(fname, "LC|RC", ip, idx - 1,
whichfork); whichfork);
xfs_bmbt_set_blockcount(ep - 1, xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
left.br_blockcount + new->br_blockcount + left.br_blockcount + new->br_blockcount +
right.br_blockcount); right.br_blockcount);
xfs_bmap_trace_post_update(fname, "LC|RC", ip, idx - 1, xfs_bmap_trace_post_update(fname, "LC|RC", ip, idx - 1,
whichfork); whichfork);
xfs_bmap_trace_delete(fname, "LC|RC", ip, xfs_bmap_trace_delete(fname, "LC|RC", ip,
idx, 1, whichfork); idx, 1, whichfork);
xfs_bmap_delete_exlist(ip, idx, 1, whichfork); xfs_iext_remove(ifp, idx, 1);
ifp->if_lastex = idx - 1; ifp->if_lastex = idx - 1;
XFS_IFORK_NEXT_SET(ip, whichfork, XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) - 1); XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
...@@ -2062,7 +2045,7 @@ xfs_bmap_add_extent_hole_real( ...@@ -2062,7 +2045,7 @@ xfs_bmap_add_extent_hole_real(
* Merge the new allocation with the left neighbor. * Merge the new allocation with the left neighbor.
*/ */
xfs_bmap_trace_pre_update(fname, "LC", ip, idx - 1, whichfork); xfs_bmap_trace_pre_update(fname, "LC", ip, idx - 1, whichfork);
xfs_bmbt_set_blockcount(ep - 1, xfs_bmbt_set_blockcount(xfs_iext_get_ext(ifp, idx - 1),
left.br_blockcount + new->br_blockcount); left.br_blockcount + new->br_blockcount);
xfs_bmap_trace_post_update(fname, "LC", ip, idx - 1, whichfork); xfs_bmap_trace_post_update(fname, "LC", ip, idx - 1, whichfork);
ifp->if_lastex = idx - 1; ifp->if_lastex = idx - 1;
...@@ -2116,7 +2099,7 @@ xfs_bmap_add_extent_hole_real( ...@@ -2116,7 +2099,7 @@ xfs_bmap_add_extent_hole_real(
*/ */
xfs_bmap_trace_insert(fname, "0", ip, idx, 1, new, NULL, xfs_bmap_trace_insert(fname, "0", ip, idx, 1, new, NULL,
whichfork); whichfork);
xfs_bmap_insert_exlist(ip, idx, 1, new, whichfork); xfs_iext_insert(ifp, idx, 1, new);
ifp->if_lastex = idx; ifp->if_lastex = idx;
XFS_IFORK_NEXT_SET(ip, whichfork, XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) + 1); XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
...@@ -2811,7 +2794,7 @@ xfs_bmap_alloc( ...@@ -2811,7 +2794,7 @@ xfs_bmap_alloc(
/* /*
* Transform a btree format file with only one leaf node, where the * Transform a btree format file with only one leaf node, where the
* extents list will fit in the inode, into an extents format file. * extents list will fit in the inode, into an extents format file.
* Since the extent list is already in-core, all we have to do is * Since the file extents are already in-core, all we have to do is
* give up the space for the btree root and pitch the leaf block. * give up the space for the btree root and pitch the leaf block.
*/ */
STATIC int /* error */ STATIC int /* error */
...@@ -2868,7 +2851,7 @@ xfs_bmap_btree_to_extents( ...@@ -2868,7 +2851,7 @@ xfs_bmap_btree_to_extents(
} }
/* /*
* Called by xfs_bmapi to update extent list structure and the btree * Called by xfs_bmapi to update file extent records and the btree
* after removing space (or undoing a delayed allocation). * after removing space (or undoing a delayed allocation).
*/ */
STATIC int /* error */ STATIC int /* error */
...@@ -2878,7 +2861,7 @@ xfs_bmap_del_extent( ...@@ -2878,7 +2861,7 @@ xfs_bmap_del_extent(
xfs_extnum_t idx, /* extent number to update/delete */ xfs_extnum_t idx, /* extent number to update/delete */
xfs_bmap_free_t *flist, /* list of extents to be freed */ xfs_bmap_free_t *flist, /* list of extents to be freed */
xfs_btree_cur_t *cur, /* if null, not a btree */ xfs_btree_cur_t *cur, /* if null, not a btree */
xfs_bmbt_irec_t *del, /* data to remove from extent list */ xfs_bmbt_irec_t *del, /* data to remove from extents */
int *logflagsp, /* inode logging flags */ int *logflagsp, /* inode logging flags */
int whichfork, /* data or attr fork */ int whichfork, /* data or attr fork */
int rsvd) /* OK to allocate reserved blocks */ int rsvd) /* OK to allocate reserved blocks */
...@@ -2903,7 +2886,6 @@ xfs_bmap_del_extent( ...@@ -2903,7 +2886,6 @@ xfs_bmap_del_extent(
xfs_filblks_t nblks; /* quota/sb block count */ xfs_filblks_t nblks; /* quota/sb block count */
xfs_bmbt_irec_t new; /* new record to be inserted */ xfs_bmbt_irec_t new; /* new record to be inserted */
/* REFERENCED */ /* REFERENCED */
xfs_extnum_t nextents; /* number of extents in list */
uint qfield; /* quota field to update */ uint qfield; /* quota field to update */
xfs_filblks_t temp; /* for indirect length calculations */ xfs_filblks_t temp; /* for indirect length calculations */
xfs_filblks_t temp2; /* for indirect length calculations */ xfs_filblks_t temp2; /* for indirect length calculations */
...@@ -2911,10 +2893,10 @@ xfs_bmap_del_extent( ...@@ -2911,10 +2893,10 @@ xfs_bmap_del_extent(
XFS_STATS_INC(xs_del_exlist); XFS_STATS_INC(xs_del_exlist);
mp = ip->i_mount; mp = ip->i_mount;
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); ASSERT((idx >= 0) && (idx < ifp->if_bytes /
ASSERT(idx >= 0 && idx < nextents); (uint)sizeof(xfs_bmbt_rec_t)));
ASSERT(del->br_blockcount > 0); ASSERT(del->br_blockcount > 0);
ep = &ifp->if_u1.if_extents[idx]; ep = xfs_iext_get_ext(ifp, idx);
xfs_bmbt_get_all(ep, &got); xfs_bmbt_get_all(ep, &got);
ASSERT(got.br_startoff <= del->br_startoff); ASSERT(got.br_startoff <= del->br_startoff);
del_endoff = del->br_startoff + del->br_blockcount; del_endoff = del->br_startoff + del->br_blockcount;
...@@ -2990,7 +2972,7 @@ xfs_bmap_del_extent( ...@@ -2990,7 +2972,7 @@ xfs_bmap_del_extent(
* Matches the whole extent. Delete the entry. * Matches the whole extent. Delete the entry.
*/ */
xfs_bmap_trace_delete(fname, "3", ip, idx, 1, whichfork); xfs_bmap_trace_delete(fname, "3", ip, idx, 1, whichfork);
xfs_bmap_delete_exlist(ip, idx, 1, whichfork); xfs_iext_remove(ifp, idx, 1);
ifp->if_lastex = idx; ifp->if_lastex = idx;
if (delay) if (delay)
break; break;
...@@ -3160,7 +3142,7 @@ xfs_bmap_del_extent( ...@@ -3160,7 +3142,7 @@ xfs_bmap_del_extent(
xfs_bmap_trace_post_update(fname, "0", ip, idx, whichfork); xfs_bmap_trace_post_update(fname, "0", ip, idx, whichfork);
xfs_bmap_trace_insert(fname, "0", ip, idx + 1, 1, &new, NULL, xfs_bmap_trace_insert(fname, "0", ip, idx + 1, 1, &new, NULL,
whichfork); whichfork);
xfs_bmap_insert_exlist(ip, idx + 1, 1, &new, whichfork); xfs_iext_insert(ifp, idx + 1, 1, &new);
ifp->if_lastex = idx + 1; ifp->if_lastex = idx + 1;
break; break;
} }
...@@ -3212,31 +3194,6 @@ xfs_bmap_del_free( ...@@ -3212,31 +3194,6 @@ xfs_bmap_del_free(
kmem_zone_free(xfs_bmap_free_item_zone, free); kmem_zone_free(xfs_bmap_free_item_zone, free);
} }
/*
* Remove count entries from the extents array for inode "ip", starting
* at index "idx". Copies the remaining items down over the deleted ones,
* and gives back the excess memory.
*/
STATIC void
xfs_bmap_delete_exlist(
xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* starting delete index */
xfs_extnum_t count, /* count of items to delete */
int whichfork) /* data or attr fork */
{
xfs_bmbt_rec_t *base; /* base of extent list */
xfs_ifork_t *ifp; /* inode fork pointer */
xfs_extnum_t nextents; /* number of extents in list after */
ifp = XFS_IFORK_PTR(ip, whichfork);
ASSERT(ifp->if_flags & XFS_IFEXTENTS);
base = ifp->if_u1.if_extents;
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t) - count;
memmove(&base[idx], &base[idx + count],
(nextents - idx) * sizeof(*base));
xfs_iext_realloc(ip, -count, whichfork);
}
/* /*
* Convert an extents-format file into a btree-format file. * Convert an extents-format file into a btree-format file.
* The new file will have a root block (in the inode) and a single child block. * The new file will have a root block (in the inode) and a single child block.
...@@ -3258,13 +3215,13 @@ xfs_bmap_extents_to_btree( ...@@ -3258,13 +3215,13 @@ xfs_bmap_extents_to_btree(
xfs_bmbt_rec_t *arp; /* child record pointer */ xfs_bmbt_rec_t *arp; /* child record pointer */
xfs_bmbt_block_t *block; /* btree root block */ xfs_bmbt_block_t *block; /* btree root block */
xfs_btree_cur_t *cur; /* bmap btree cursor */ xfs_btree_cur_t *cur; /* bmap btree cursor */
xfs_bmbt_rec_t *ep; /* extent list pointer */ xfs_bmbt_rec_t *ep; /* extent record pointer */
int error; /* error return value */ int error; /* error return value */
xfs_extnum_t i, cnt; /* extent list index */ xfs_extnum_t i, cnt; /* extent record index */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
xfs_bmbt_key_t *kp; /* root block key pointer */ xfs_bmbt_key_t *kp; /* root block key pointer */
xfs_mount_t *mp; /* mount structure */ xfs_mount_t *mp; /* mount structure */
xfs_extnum_t nextents; /* extent list size */ xfs_extnum_t nextents; /* number of file extents */
xfs_bmbt_ptr_t *pp; /* root block address pointer */ xfs_bmbt_ptr_t *pp; /* root block address pointer */
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
...@@ -3343,7 +3300,8 @@ xfs_bmap_extents_to_btree( ...@@ -3343,7 +3300,8 @@ xfs_bmap_extents_to_btree(
ablock->bb_rightsib = cpu_to_be64(NULLDFSBNO); ablock->bb_rightsib = cpu_to_be64(NULLDFSBNO);
arp = XFS_BMAP_REC_IADDR(ablock, 1, cur); arp = XFS_BMAP_REC_IADDR(ablock, 1, cur);
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
for (ep = ifp->if_u1.if_extents, cnt = i = 0; i < nextents; i++, ep++) { for (cnt = i = 0; i < nextents; i++) {
ep = xfs_iext_get_ext(ifp, i);
if (!ISNULLSTARTBLOCK(xfs_bmbt_get_startblock(ep))) { if (!ISNULLSTARTBLOCK(xfs_bmbt_get_startblock(ep))) {
arp->l0 = INT_GET(ep->l0, ARCH_CONVERT); arp->l0 = INT_GET(ep->l0, ARCH_CONVERT);
arp->l1 = INT_GET(ep->l1, ARCH_CONVERT); arp->l1 = INT_GET(ep->l1, ARCH_CONVERT);
...@@ -3372,34 +3330,6 @@ xfs_bmap_extents_to_btree( ...@@ -3372,34 +3330,6 @@ xfs_bmap_extents_to_btree(
return 0; return 0;
} }
/*
* Insert new item(s) in the extent list for inode "ip".
* Count new items are inserted at offset idx.
*/
STATIC void
xfs_bmap_insert_exlist(
xfs_inode_t *ip, /* incore inode pointer */
xfs_extnum_t idx, /* starting index of new items */
xfs_extnum_t count, /* number of inserted items */
xfs_bmbt_irec_t *new, /* items to insert */
int whichfork) /* data or attr fork */
{
xfs_bmbt_rec_t *base; /* extent list base */
xfs_ifork_t *ifp; /* inode fork pointer */
xfs_extnum_t nextents; /* extent list size */
xfs_extnum_t to; /* extent list index */
ifp = XFS_IFORK_PTR(ip, whichfork);
ASSERT(ifp->if_flags & XFS_IFEXTENTS);
xfs_iext_realloc(ip, count, whichfork);
base = ifp->if_u1.if_extents;
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
memmove(&base[idx + count], &base[idx],
(nextents - (idx + count)) * sizeof(*base));
for (to = idx; to < idx + count; to++, new++)
xfs_bmbt_set_all(&base[to], new);
}
/* /*
* Helper routine to reset inode di_forkoff field when switching * Helper routine to reset inode di_forkoff field when switching
* attribute fork from local to extent format - we reset it where * attribute fork from local to extent format - we reset it where
...@@ -3457,8 +3387,8 @@ xfs_bmap_local_to_extents( ...@@ -3457,8 +3387,8 @@ xfs_bmap_local_to_extents(
error = 0; error = 0;
if (ifp->if_bytes) { if (ifp->if_bytes) {
xfs_alloc_arg_t args; /* allocation arguments */ xfs_alloc_arg_t args; /* allocation arguments */
xfs_buf_t *bp; /* buffer for extent list block */ xfs_buf_t *bp; /* buffer for extent block */
xfs_bmbt_rec_t *ep; /* extent list pointer */ xfs_bmbt_rec_t *ep; /* extent record pointer */
args.tp = tp; args.tp = tp;
args.mp = ip->i_mount; args.mp = ip->i_mount;
...@@ -3492,8 +3422,8 @@ xfs_bmap_local_to_extents( ...@@ -3492,8 +3422,8 @@ xfs_bmap_local_to_extents(
xfs_trans_log_buf(tp, bp, 0, ifp->if_bytes - 1); xfs_trans_log_buf(tp, bp, 0, ifp->if_bytes - 1);
xfs_bmap_forkoff_reset(args.mp, ip, whichfork); xfs_bmap_forkoff_reset(args.mp, ip, whichfork);
xfs_idata_realloc(ip, -ifp->if_bytes, whichfork); xfs_idata_realloc(ip, -ifp->if_bytes, whichfork);
xfs_iext_realloc(ip, 1, whichfork); xfs_iext_add(ifp, 0, 1);
ep = ifp->if_u1.if_extents; ep = xfs_iext_get_ext(ifp, 0);
xfs_bmbt_set_allf(ep, 0, args.fsbno, 1, XFS_EXT_NORM); xfs_bmbt_set_allf(ep, 0, args.fsbno, 1, XFS_EXT_NORM);
xfs_bmap_trace_post_update(fname, "new", ip, 0, whichfork); xfs_bmap_trace_post_update(fname, "new", ip, 0, whichfork);
XFS_IFORK_NEXT_SET(ip, whichfork, 1); XFS_IFORK_NEXT_SET(ip, whichfork, 1);
...@@ -3518,7 +3448,7 @@ xfs_bmbt_rec_t * /* pointer to found extent entry */ ...@@ -3518,7 +3448,7 @@ xfs_bmbt_rec_t * /* pointer to found extent entry */
xfs_bmap_do_search_extents( xfs_bmap_do_search_extents(
xfs_bmbt_rec_t *base, /* base of extent list */ xfs_bmbt_rec_t *base, /* base of extent list */
xfs_extnum_t lastx, /* last extent index used */ xfs_extnum_t lastx, /* last extent index used */
xfs_extnum_t nextents, /* extent list size */ xfs_extnum_t nextents, /* number of file extents */
xfs_fileoff_t bno, /* block number searched for */ xfs_fileoff_t bno, /* block number searched for */
int *eofp, /* out: end of file found */ int *eofp, /* out: end of file found */
xfs_extnum_t *lastxp, /* out: last extent index */ xfs_extnum_t *lastxp, /* out: last extent index */
...@@ -3569,9 +3499,9 @@ xfs_bmap_do_search_extents( ...@@ -3569,9 +3499,9 @@ xfs_bmap_do_search_extents(
got.br_blockcount = xfs_bmbt_get_blockcount(ep); got.br_blockcount = xfs_bmbt_get_blockcount(ep);
*eofp = 0; *eofp = 0;
} else { } else {
/* binary search the extents array */
low = 0; low = 0;
high = nextents - 1; high = nextents - 1;
/* binary search the extents array */
while (low <= high) { while (low <= high) {
XFS_STATS_INC(xs_cmp_exlist); XFS_STATS_INC(xs_cmp_exlist);
lastx = (low + high) >> 1; lastx = (low + high) >> 1;
...@@ -3641,8 +3571,8 @@ xfs_bmap_search_extents( ...@@ -3641,8 +3571,8 @@ xfs_bmap_search_extents(
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
xfs_bmbt_rec_t *base; /* base of extent list */ xfs_bmbt_rec_t *base; /* base of extent list */
xfs_extnum_t lastx; /* last extent index used */ xfs_extnum_t lastx; /* last extent index used */
xfs_extnum_t nextents; /* extent list size */ xfs_extnum_t nextents; /* number of file extents */
xfs_bmbt_rec_t *ep; /* extent list entry pointer */ xfs_bmbt_rec_t *ep; /* extent record pointer */
int rt; /* realtime flag */ int rt; /* realtime flag */
XFS_STATS_INC(xs_look_exlist); XFS_STATS_INC(xs_look_exlist);
...@@ -3732,7 +3662,7 @@ xfs_bmap_trace_addentry( ...@@ -3732,7 +3662,7 @@ xfs_bmap_trace_addentry(
} }
/* /*
* Add bmap trace entry prior to a call to xfs_bmap_delete_exlist. * Add bmap trace entry prior to a call to xfs_iext_remove.
*/ */
STATIC void STATIC void
xfs_bmap_trace_delete( xfs_bmap_trace_delete(
...@@ -3747,13 +3677,13 @@ xfs_bmap_trace_delete( ...@@ -3747,13 +3677,13 @@ xfs_bmap_trace_delete(
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
xfs_bmap_trace_addentry(XFS_BMAP_KTRACE_DELETE, fname, desc, ip, idx, xfs_bmap_trace_addentry(XFS_BMAP_KTRACE_DELETE, fname, desc, ip, idx,
cnt, &ifp->if_u1.if_extents[idx], cnt, xfs_iext_get_ext(ifp, idx),
cnt == 2 ? &ifp->if_u1.if_extents[idx + 1] : NULL, cnt == 2 ? xfs_iext_get_ext(ifp, idx + 1) : NULL,
whichfork); whichfork);
} }
/* /*
* Add bmap trace entry prior to a call to xfs_bmap_insert_exlist, or * Add bmap trace entry prior to a call to xfs_iext_insert, or
* reading in the extents list from the disk (in the btree). * reading in the extents list from the disk (in the btree).
*/ */
STATIC void STATIC void
...@@ -3783,7 +3713,7 @@ xfs_bmap_trace_insert( ...@@ -3783,7 +3713,7 @@ xfs_bmap_trace_insert(
} }
/* /*
* Add bmap trace entry after updating an extent list entry in place. * Add bmap trace entry after updating an extent record in place.
*/ */
STATIC void STATIC void
xfs_bmap_trace_post_update( xfs_bmap_trace_post_update(
...@@ -3797,11 +3727,11 @@ xfs_bmap_trace_post_update( ...@@ -3797,11 +3727,11 @@ xfs_bmap_trace_post_update(
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
xfs_bmap_trace_addentry(XFS_BMAP_KTRACE_POST_UP, fname, desc, ip, idx, xfs_bmap_trace_addentry(XFS_BMAP_KTRACE_POST_UP, fname, desc, ip, idx,
1, &ifp->if_u1.if_extents[idx], NULL, whichfork); 1, xfs_iext_get_ext(ifp, idx), NULL, whichfork);
} }
/* /*
* Add bmap trace entry prior to updating an extent list entry in place. * Add bmap trace entry prior to updating an extent record in place.
*/ */
STATIC void STATIC void
xfs_bmap_trace_pre_update( xfs_bmap_trace_pre_update(
...@@ -3815,7 +3745,7 @@ xfs_bmap_trace_pre_update( ...@@ -3815,7 +3745,7 @@ xfs_bmap_trace_pre_update(
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
xfs_bmap_trace_addentry(XFS_BMAP_KTRACE_PRE_UP, fname, desc, ip, idx, 1, xfs_bmap_trace_addentry(XFS_BMAP_KTRACE_PRE_UP, fname, desc, ip, idx, 1,
&ifp->if_u1.if_extents[idx], NULL, whichfork); xfs_iext_get_ext(ifp, idx), NULL, whichfork);
} }
#endif /* XFS_BMAP_TRACE */ #endif /* XFS_BMAP_TRACE */
...@@ -3892,7 +3822,7 @@ xfs_bmap_add_attrfork( ...@@ -3892,7 +3822,7 @@ xfs_bmap_add_attrfork(
int rsvd) /* xact may use reserved blks */ int rsvd) /* xact may use reserved blks */
{ {
xfs_fsblock_t firstblock; /* 1st block/ag allocated */ xfs_fsblock_t firstblock; /* 1st block/ag allocated */
xfs_bmap_free_t flist; /* freed extent list */ xfs_bmap_free_t flist; /* freed extent records */
xfs_mount_t *mp; /* mount structure */ xfs_mount_t *mp; /* mount structure */
xfs_trans_t *tp; /* transaction pointer */ xfs_trans_t *tp; /* transaction pointer */
unsigned long s; /* spinlock spl value */ unsigned long s; /* spinlock spl value */
...@@ -4146,7 +4076,7 @@ xfs_bmap_finish( ...@@ -4146,7 +4076,7 @@ xfs_bmap_finish(
xfs_efd_log_item_t *efd; /* extent free data */ xfs_efd_log_item_t *efd; /* extent free data */
xfs_efi_log_item_t *efi; /* extent free intention */ xfs_efi_log_item_t *efi; /* extent free intention */
int error; /* error return value */ int error; /* error return value */
xfs_bmap_free_item_t *free; /* free extent list item */ xfs_bmap_free_item_t *free; /* free extent item */
unsigned int logres; /* new log reservation */ unsigned int logres; /* new log reservation */
unsigned int logcount; /* new log count */ unsigned int logcount; /* new log count */
xfs_mount_t *mp; /* filesystem mount structure */ xfs_mount_t *mp; /* filesystem mount structure */
...@@ -4242,9 +4172,9 @@ xfs_bmap_first_unused( ...@@ -4242,9 +4172,9 @@ xfs_bmap_first_unused(
xfs_fileoff_t *first_unused, /* unused block */ xfs_fileoff_t *first_unused, /* unused block */
int whichfork) /* data or attr fork */ int whichfork) /* data or attr fork */
{ {
xfs_bmbt_rec_t *base; /* base of extent array */
xfs_bmbt_rec_t *ep; /* pointer to an extent entry */ xfs_bmbt_rec_t *ep; /* pointer to an extent entry */
int error; /* error return value */ int error; /* error return value */
int idx; /* extent record index */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
xfs_fileoff_t lastaddr; /* last block number seen */ xfs_fileoff_t lastaddr; /* last block number seen */
xfs_fileoff_t lowest; /* lowest useful block */ xfs_fileoff_t lowest; /* lowest useful block */
...@@ -4265,10 +4195,8 @@ xfs_bmap_first_unused( ...@@ -4265,10 +4195,8 @@ xfs_bmap_first_unused(
return error; return error;
lowest = *first_unused; lowest = *first_unused;
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
base = &ifp->if_u1.if_extents[0]; for (idx = 0, lastaddr = 0, max = lowest; idx < nextents; idx++) {
for (lastaddr = 0, max = lowest, ep = base; ep = xfs_iext_get_ext(ifp, idx);
ep < &base[nextents];
ep++) {
off = xfs_bmbt_get_startoff(ep); off = xfs_bmbt_get_startoff(ep);
/* /*
* See if the hole before this extent will work. * See if the hole before this extent will work.
...@@ -4287,8 +4215,8 @@ xfs_bmap_first_unused( ...@@ -4287,8 +4215,8 @@ xfs_bmap_first_unused(
/* /*
* Returns the file-relative block number of the last block + 1 before * Returns the file-relative block number of the last block + 1 before
* last_block (input value) in the file. * last_block (input value) in the file.
* This is not based on i_size, it is based on the extent list. * This is not based on i_size, it is based on the extent records.
* Returns 0 for local files, as they do not have an extent list. * Returns 0 for local files, as they do not have extent records.
*/ */
int /* error */ int /* error */
xfs_bmap_last_before( xfs_bmap_last_before(
...@@ -4335,8 +4263,8 @@ xfs_bmap_last_before( ...@@ -4335,8 +4263,8 @@ xfs_bmap_last_before(
/* /*
* Returns the file-relative block number of the first block past eof in * Returns the file-relative block number of the first block past eof in
* the file. This is not based on i_size, it is based on the extent list. * the file. This is not based on i_size, it is based on the extent records.
* Returns 0 for local files, as they do not have an extent list. * Returns 0 for local files, as they do not have extent records.
*/ */
int /* error */ int /* error */
xfs_bmap_last_offset( xfs_bmap_last_offset(
...@@ -4345,7 +4273,6 @@ xfs_bmap_last_offset( ...@@ -4345,7 +4273,6 @@ xfs_bmap_last_offset(
xfs_fileoff_t *last_block, /* last block */ xfs_fileoff_t *last_block, /* last block */
int whichfork) /* data or attr fork */ int whichfork) /* data or attr fork */
{ {
xfs_bmbt_rec_t *base; /* base of extent array */
xfs_bmbt_rec_t *ep; /* pointer to last extent */ xfs_bmbt_rec_t *ep; /* pointer to last extent */
int error; /* error return value */ int error; /* error return value */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
...@@ -4368,9 +4295,7 @@ xfs_bmap_last_offset( ...@@ -4368,9 +4295,7 @@ xfs_bmap_last_offset(
*last_block = 0; *last_block = 0;
return 0; return 0;
} }
base = &ifp->if_u1.if_extents[0]; ep = xfs_iext_get_ext(ifp, nextents - 1);
ASSERT(base != NULL);
ep = &base[nextents - 1];
*last_block = xfs_bmbt_get_startoff(ep) + xfs_bmbt_get_blockcount(ep); *last_block = xfs_bmbt_get_startoff(ep) + xfs_bmbt_get_blockcount(ep);
return 0; return 0;
} }
...@@ -4400,7 +4325,7 @@ xfs_bmap_one_block( ...@@ -4400,7 +4325,7 @@ xfs_bmap_one_block(
return 0; return 0;
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
ASSERT(ifp->if_flags & XFS_IFEXTENTS); ASSERT(ifp->if_flags & XFS_IFEXTENTS);
ep = ifp->if_u1.if_extents; ep = xfs_iext_get_ext(ifp, 0);
xfs_bmbt_get_all(ep, &s); xfs_bmbt_get_all(ep, &s);
rval = s.br_startoff == 0 && s.br_blockcount == 1; rval = s.br_startoff == 0 && s.br_blockcount == 1;
if (rval && whichfork == XFS_DATA_FORK) if (rval && whichfork == XFS_DATA_FORK)
...@@ -4435,7 +4360,6 @@ xfs_bmap_read_extents( ...@@ -4435,7 +4360,6 @@ xfs_bmap_read_extents(
xfs_bmbt_ptr_t *pp; /* pointer to block address */ xfs_bmbt_ptr_t *pp; /* pointer to block address */
/* REFERENCED */ /* REFERENCED */
xfs_extnum_t room; /* number of entries there's room for */ xfs_extnum_t room; /* number of entries there's room for */
xfs_bmbt_rec_t *trp; /* target record pointer */
bno = NULLFSBLOCK; bno = NULLFSBLOCK;
mp = ip->i_mount; mp = ip->i_mount;
...@@ -4478,16 +4402,16 @@ xfs_bmap_read_extents( ...@@ -4478,16 +4402,16 @@ xfs_bmap_read_extents(
/* /*
* Here with bp and block set to the leftmost leaf node in the tree. * Here with bp and block set to the leftmost leaf node in the tree.
*/ */
room = ifp->if_bytes / (uint)sizeof(*trp); room = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
trp = ifp->if_u1.if_extents;
i = 0; i = 0;
/* /*
* Loop over all leaf nodes. Copy information to the extent list. * Loop over all leaf nodes. Copy information to the extent records.
*/ */
for (;;) { for (;;) {
xfs_bmbt_rec_t *frp, *temp; xfs_bmbt_rec_t *frp, *trp;
xfs_fsblock_t nextbno; xfs_fsblock_t nextbno;
xfs_extnum_t num_recs; xfs_extnum_t num_recs;
xfs_extnum_t start;
num_recs = be16_to_cpu(block->bb_numrecs); num_recs = be16_to_cpu(block->bb_numrecs);
...@@ -4511,12 +4435,13 @@ xfs_bmap_read_extents( ...@@ -4511,12 +4435,13 @@ xfs_bmap_read_extents(
if (nextbno != NULLFSBLOCK) if (nextbno != NULLFSBLOCK)
xfs_btree_reada_bufl(mp, nextbno, 1); xfs_btree_reada_bufl(mp, nextbno, 1);
/* /*
* Copy records into the extent list. * Copy records into the extent records.
*/ */
frp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_bmbt, frp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_bmbt,
block, 1, mp->m_bmap_dmxr[0]); block, 1, mp->m_bmap_dmxr[0]);
temp = trp; start = i;
for (j = 0; j < num_recs; j++, frp++, trp++) { for (j = 0; j < num_recs; j++, i++, frp++) {
trp = xfs_iext_get_ext(ifp, i);
trp->l0 = INT_GET(frp->l0, ARCH_CONVERT); trp->l0 = INT_GET(frp->l0, ARCH_CONVERT);
trp->l1 = INT_GET(frp->l1, ARCH_CONVERT); trp->l1 = INT_GET(frp->l1, ARCH_CONVERT);
} }
...@@ -4526,14 +4451,14 @@ xfs_bmap_read_extents( ...@@ -4526,14 +4451,14 @@ xfs_bmap_read_extents(
* any "older" data bmap btree records for a * any "older" data bmap btree records for a
* set bit in the "extent flag" position. * set bit in the "extent flag" position.
*/ */
if (unlikely(xfs_check_nostate_extents(temp, num_recs))) { if (unlikely(xfs_check_nostate_extents(ifp,
start, num_recs))) {
XFS_ERROR_REPORT("xfs_bmap_read_extents(2)", XFS_ERROR_REPORT("xfs_bmap_read_extents(2)",
XFS_ERRLEVEL_LOW, XFS_ERRLEVEL_LOW,
ip->i_mount); ip->i_mount);
goto error0; goto error0;
} }
} }
i += num_recs;
xfs_trans_brelse(tp, bp); xfs_trans_brelse(tp, bp);
bno = nextbno; bno = nextbno;
/* /*
...@@ -4546,7 +4471,7 @@ xfs_bmap_read_extents( ...@@ -4546,7 +4471,7 @@ xfs_bmap_read_extents(
return error; return error;
block = XFS_BUF_TO_BMBT_BLOCK(bp); block = XFS_BUF_TO_BMBT_BLOCK(bp);
} }
ASSERT(i == ifp->if_bytes / (uint)sizeof(*trp)); ASSERT(i == (ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t)));
ASSERT(i == XFS_IFORK_NEXTENTS(ip, whichfork)); ASSERT(i == XFS_IFORK_NEXTENTS(ip, whichfork));
xfs_bmap_trace_exlist(fname, ip, i, whichfork); xfs_bmap_trace_exlist(fname, ip, i, whichfork);
return 0; return 0;
...@@ -4557,7 +4482,7 @@ xfs_bmap_read_extents( ...@@ -4557,7 +4482,7 @@ xfs_bmap_read_extents(
#ifdef XFS_BMAP_TRACE #ifdef XFS_BMAP_TRACE
/* /*
* Add bmap trace insert entries for all the contents of the extent list. * Add bmap trace insert entries for all the contents of the extent records.
*/ */
void void
xfs_bmap_trace_exlist( xfs_bmap_trace_exlist(
...@@ -4566,16 +4491,15 @@ xfs_bmap_trace_exlist( ...@@ -4566,16 +4491,15 @@ xfs_bmap_trace_exlist(
xfs_extnum_t cnt, /* count of entries in the list */ xfs_extnum_t cnt, /* count of entries in the list */
int whichfork) /* data or attr fork */ int whichfork) /* data or attr fork */
{ {
xfs_bmbt_rec_t *base; /* base of extent list */ xfs_bmbt_rec_t *ep; /* current extent record */
xfs_bmbt_rec_t *ep; /* current entry in extent list */ xfs_extnum_t idx; /* extent record index */
xfs_extnum_t idx; /* extent list entry number */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
xfs_bmbt_irec_t s; /* extent list record */ xfs_bmbt_irec_t s; /* file extent record */
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
ASSERT(cnt == ifp->if_bytes / (uint)sizeof(*base)); ASSERT(cnt == (ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t)));
base = ifp->if_u1.if_extents; for (idx = 0; idx < cnt; idx++) {
for (idx = 0, ep = base; idx < cnt; idx++, ep++) { ep = xfs_iext_get_ext(ifp, idx);
xfs_bmbt_get_all(ep, &s); xfs_bmbt_get_all(ep, &s);
xfs_bmap_trace_insert(fname, "exlist", ip, idx, 1, &s, NULL, xfs_bmap_trace_insert(fname, "exlist", ip, idx, 1, &s, NULL,
whichfork); whichfork);
...@@ -4661,14 +4585,14 @@ xfs_bmapi( ...@@ -4661,14 +4585,14 @@ xfs_bmapi(
xfs_bmalloca_t bma; /* args for xfs_bmap_alloc */ xfs_bmalloca_t bma; /* args for xfs_bmap_alloc */
xfs_btree_cur_t *cur; /* bmap btree cursor */ xfs_btree_cur_t *cur; /* bmap btree cursor */
xfs_fileoff_t end; /* end of mapped file region */ xfs_fileoff_t end; /* end of mapped file region */
int eof; /* we've hit the end of extent list */ int eof; /* we've hit the end of extents */
char contig; /* allocation must be one extent */ char contig; /* allocation must be one extent */
char delay; /* this request is for delayed alloc */ char delay; /* this request is for delayed alloc */
char exact; /* don't do all of wasdelayed extent */ char exact; /* don't do all of wasdelayed extent */
char convert; /* unwritten extent I/O completion */ char convert; /* unwritten extent I/O completion */
xfs_bmbt_rec_t *ep; /* extent list entry pointer */ xfs_bmbt_rec_t *ep; /* extent record pointer */
int error; /* error return */ int error; /* error return */
xfs_bmbt_irec_t got; /* current extent list record */ xfs_bmbt_irec_t got; /* current file extent record */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
xfs_extlen_t indlen; /* indirect blocks length */ xfs_extlen_t indlen; /* indirect blocks length */
xfs_extnum_t lastx; /* last useful extent number */ xfs_extnum_t lastx; /* last useful extent number */
...@@ -4680,7 +4604,7 @@ xfs_bmapi( ...@@ -4680,7 +4604,7 @@ xfs_bmapi(
int nallocs; /* number of extents alloc\'d */ int nallocs; /* number of extents alloc\'d */
xfs_extnum_t nextents; /* number of extents in file */ xfs_extnum_t nextents; /* number of extents in file */
xfs_fileoff_t obno; /* old block number (offset) */ xfs_fileoff_t obno; /* old block number (offset) */
xfs_bmbt_irec_t prev; /* previous extent list record */ xfs_bmbt_irec_t prev; /* previous file extent record */
int tmp_logflags; /* temp flags holder */ int tmp_logflags; /* temp flags holder */
int whichfork; /* data or attr fork */ int whichfork; /* data or attr fork */
char inhole; /* current location is hole in file */ char inhole; /* current location is hole in file */
...@@ -4805,7 +4729,7 @@ xfs_bmapi( ...@@ -4805,7 +4729,7 @@ xfs_bmapi(
alen = (xfs_extlen_t)got.br_blockcount; alen = (xfs_extlen_t)got.br_blockcount;
aoff = got.br_startoff; aoff = got.br_startoff;
if (lastx != NULLEXTNUM && lastx) { if (lastx != NULLEXTNUM && lastx) {
ep = &ifp->if_u1.if_extents[lastx - 1]; ep = xfs_iext_get_ext(ifp, lastx - 1);
xfs_bmbt_get_all(ep, &prev); xfs_bmbt_get_all(ep, &prev);
} }
} else if (wasdelay) { } else if (wasdelay) {
...@@ -5016,7 +4940,7 @@ xfs_bmapi( ...@@ -5016,7 +4940,7 @@ xfs_bmapi(
if (error) if (error)
goto error0; goto error0;
lastx = ifp->if_lastex; lastx = ifp->if_lastex;
ep = &ifp->if_u1.if_extents[lastx]; ep = xfs_iext_get_ext(ifp, lastx);
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
xfs_bmbt_get_all(ep, &got); xfs_bmbt_get_all(ep, &got);
ASSERT(got.br_startoff <= aoff); ASSERT(got.br_startoff <= aoff);
...@@ -5112,7 +5036,7 @@ xfs_bmapi( ...@@ -5112,7 +5036,7 @@ xfs_bmapi(
if (error) if (error)
goto error0; goto error0;
lastx = ifp->if_lastex; lastx = ifp->if_lastex;
ep = &ifp->if_u1.if_extents[lastx]; ep = xfs_iext_get_ext(ifp, lastx);
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
xfs_bmbt_get_all(ep, &got); xfs_bmbt_get_all(ep, &got);
/* /*
...@@ -5168,8 +5092,7 @@ xfs_bmapi( ...@@ -5168,8 +5092,7 @@ xfs_bmapi(
/* /*
* Else go on to the next record. * Else go on to the next record.
*/ */
ep++; ep = xfs_iext_get_ext(ifp, ++lastx);
lastx++;
if (lastx >= nextents) { if (lastx >= nextents) {
eof = 1; eof = 1;
prev = got; prev = got;
...@@ -5199,7 +5122,7 @@ xfs_bmapi( ...@@ -5199,7 +5122,7 @@ xfs_bmapi(
error0: error0:
/* /*
* Log everything. Do this after conversion, there's no point in * Log everything. Do this after conversion, there's no point in
* logging the extent list if we've converted to btree format. * logging the extent records if we've converted to btree format.
*/ */
if ((logflags & XFS_ILOG_FEXT(whichfork)) && if ((logflags & XFS_ILOG_FEXT(whichfork)) &&
XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS) XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS)
...@@ -5252,12 +5175,12 @@ xfs_bmapi_single( ...@@ -5252,12 +5175,12 @@ xfs_bmapi_single(
xfs_fsblock_t *fsb, /* output: mapped block */ xfs_fsblock_t *fsb, /* output: mapped block */
xfs_fileoff_t bno) /* starting file offs. mapped */ xfs_fileoff_t bno) /* starting file offs. mapped */
{ {
int eof; /* we've hit the end of extent list */ int eof; /* we've hit the end of extents */
int error; /* error return */ int error; /* error return */
xfs_bmbt_irec_t got; /* current extent list record */ xfs_bmbt_irec_t got; /* current file extent record */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
xfs_extnum_t lastx; /* last useful extent number */ xfs_extnum_t lastx; /* last useful extent number */
xfs_bmbt_irec_t prev; /* previous extent list record */ xfs_bmbt_irec_t prev; /* previous file extent record */
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
if (unlikely( if (unlikely(
...@@ -5312,18 +5235,18 @@ xfs_bunmapi( ...@@ -5312,18 +5235,18 @@ xfs_bunmapi(
xfs_btree_cur_t *cur; /* bmap btree cursor */ xfs_btree_cur_t *cur; /* bmap btree cursor */
xfs_bmbt_irec_t del; /* extent being deleted */ xfs_bmbt_irec_t del; /* extent being deleted */
int eof; /* is deleting at eof */ int eof; /* is deleting at eof */
xfs_bmbt_rec_t *ep; /* extent list entry pointer */ xfs_bmbt_rec_t *ep; /* extent record pointer */
int error; /* error return value */ int error; /* error return value */
xfs_extnum_t extno; /* extent number in list */ xfs_extnum_t extno; /* extent number in list */
xfs_bmbt_irec_t got; /* current extent list entry */ xfs_bmbt_irec_t got; /* current extent record */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
int isrt; /* freeing in rt area */ int isrt; /* freeing in rt area */
xfs_extnum_t lastx; /* last extent index used */ xfs_extnum_t lastx; /* last extent index used */
int logflags; /* transaction logging flags */ int logflags; /* transaction logging flags */
xfs_extlen_t mod; /* rt extent offset */ xfs_extlen_t mod; /* rt extent offset */
xfs_mount_t *mp; /* mount structure */ xfs_mount_t *mp; /* mount structure */
xfs_extnum_t nextents; /* size of extent list */ xfs_extnum_t nextents; /* number of file extents */
xfs_bmbt_irec_t prev; /* previous extent list entry */ xfs_bmbt_irec_t prev; /* previous extent record */
xfs_fileoff_t start; /* first file offset deleted */ xfs_fileoff_t start; /* first file offset deleted */
int tmp_logflags; /* partial logging flags */ int tmp_logflags; /* partial logging flags */
int wasdel; /* was a delayed alloc extent */ int wasdel; /* was a delayed alloc extent */
...@@ -5369,7 +5292,7 @@ xfs_bunmapi( ...@@ -5369,7 +5292,7 @@ xfs_bunmapi(
* file, back up to the last block if so... * file, back up to the last block if so...
*/ */
if (eof) { if (eof) {
ep = &ifp->if_u1.if_extents[--lastx]; ep = xfs_iext_get_ext(ifp, --lastx);
xfs_bmbt_get_all(ep, &got); xfs_bmbt_get_all(ep, &got);
bno = got.br_startoff + got.br_blockcount - 1; bno = got.br_startoff + got.br_blockcount - 1;
} }
...@@ -5393,7 +5316,7 @@ xfs_bunmapi( ...@@ -5393,7 +5316,7 @@ xfs_bunmapi(
if (got.br_startoff > bno) { if (got.br_startoff > bno) {
if (--lastx < 0) if (--lastx < 0)
break; break;
ep--; ep = xfs_iext_get_ext(ifp, lastx);
xfs_bmbt_get_all(ep, &got); xfs_bmbt_get_all(ep, &got);
} }
/* /*
...@@ -5440,7 +5363,8 @@ xfs_bunmapi( ...@@ -5440,7 +5363,8 @@ xfs_bunmapi(
del.br_blockcount : mod; del.br_blockcount : mod;
if (bno < got.br_startoff) { if (bno < got.br_startoff) {
if (--lastx >= 0) if (--lastx >= 0)
xfs_bmbt_get_all(--ep, &got); xfs_bmbt_get_all(xfs_iext_get_ext(
ifp, lastx), &got);
} }
continue; continue;
} }
...@@ -5500,7 +5424,8 @@ xfs_bunmapi( ...@@ -5500,7 +5424,8 @@ xfs_bunmapi(
* try again. * try again.
*/ */
ASSERT(lastx > 0); ASSERT(lastx > 0);
xfs_bmbt_get_all(ep - 1, &prev); xfs_bmbt_get_all(xfs_iext_get_ext(ifp,
lastx - 1), &prev);
ASSERT(prev.br_state == XFS_EXT_NORM); ASSERT(prev.br_state == XFS_EXT_NORM);
ASSERT(!ISNULLSTARTBLOCK(prev.br_startblock)); ASSERT(!ISNULLSTARTBLOCK(prev.br_startblock));
ASSERT(del.br_startblock == ASSERT(del.br_startblock ==
...@@ -5587,12 +5512,12 @@ xfs_bunmapi( ...@@ -5587,12 +5512,12 @@ xfs_bunmapi(
* If not done go on to the next (previous) record. * If not done go on to the next (previous) record.
* Reset ep in case the extents array was re-alloced. * Reset ep in case the extents array was re-alloced.
*/ */
ep = &ifp->if_u1.if_extents[lastx]; ep = xfs_iext_get_ext(ifp, lastx);
if (bno != (xfs_fileoff_t)-1 && bno >= start) { if (bno != (xfs_fileoff_t)-1 && bno >= start) {
if (lastx >= XFS_IFORK_NEXTENTS(ip, whichfork) || if (lastx >= XFS_IFORK_NEXTENTS(ip, whichfork) ||
xfs_bmbt_get_startoff(ep) > bno) { xfs_bmbt_get_startoff(ep) > bno) {
lastx--; if (--lastx >= 0)
ep--; ep = xfs_iext_get_ext(ifp, lastx);
} }
if (lastx >= 0) if (lastx >= 0)
xfs_bmbt_get_all(ep, &got); xfs_bmbt_get_all(ep, &got);
...@@ -5636,7 +5561,7 @@ xfs_bunmapi( ...@@ -5636,7 +5561,7 @@ xfs_bunmapi(
error0: error0:
/* /*
* Log everything. Do this after conversion, there's no point in * Log everything. Do this after conversion, there's no point in
* logging the extent list if we've converted to btree format. * logging the extent records if we've converted to btree format.
*/ */
if ((logflags & XFS_ILOG_FEXT(whichfork)) && if ((logflags & XFS_ILOG_FEXT(whichfork)) &&
XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS) XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS)
...@@ -5892,9 +5817,9 @@ xfs_bmap_isaeof( ...@@ -5892,9 +5817,9 @@ xfs_bmap_isaeof(
{ {
int error; /* error return value */ int error; /* error return value */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
xfs_bmbt_rec_t *lastrec; /* extent list entry pointer */ xfs_bmbt_rec_t *lastrec; /* extent record pointer */
xfs_extnum_t nextents; /* size of extent list */ xfs_extnum_t nextents; /* number of file extents */
xfs_bmbt_irec_t s; /* expanded extent list entry */ xfs_bmbt_irec_t s; /* expanded extent record */
ASSERT(whichfork == XFS_DATA_FORK); ASSERT(whichfork == XFS_DATA_FORK);
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
...@@ -5909,7 +5834,7 @@ xfs_bmap_isaeof( ...@@ -5909,7 +5834,7 @@ xfs_bmap_isaeof(
/* /*
* Go to the last extent * Go to the last extent
*/ */
lastrec = &ifp->if_u1.if_extents[nextents - 1]; lastrec = xfs_iext_get_ext(ifp, nextents - 1);
xfs_bmbt_get_all(lastrec, &s); xfs_bmbt_get_all(lastrec, &s);
/* /*
* Check we are allocating in the last extent (for delayed allocations) * Check we are allocating in the last extent (for delayed allocations)
...@@ -5936,8 +5861,8 @@ xfs_bmap_eof( ...@@ -5936,8 +5861,8 @@ xfs_bmap_eof(
xfs_fsblock_t blockcount; /* extent block count */ xfs_fsblock_t blockcount; /* extent block count */
int error; /* error return value */ int error; /* error return value */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
xfs_bmbt_rec_t *lastrec; /* extent list entry pointer */ xfs_bmbt_rec_t *lastrec; /* extent record pointer */
xfs_extnum_t nextents; /* size of extent list */ xfs_extnum_t nextents; /* number of file extents */
xfs_fileoff_t startoff; /* extent starting file offset */ xfs_fileoff_t startoff; /* extent starting file offset */
ASSERT(whichfork == XFS_DATA_FORK); ASSERT(whichfork == XFS_DATA_FORK);
...@@ -5953,7 +5878,7 @@ xfs_bmap_eof( ...@@ -5953,7 +5878,7 @@ xfs_bmap_eof(
/* /*
* Go to the last extent * Go to the last extent
*/ */
lastrec = &ifp->if_u1.if_extents[nextents - 1]; lastrec = xfs_iext_get_ext(ifp, nextents - 1);
startoff = xfs_bmbt_get_startoff(lastrec); startoff = xfs_bmbt_get_startoff(lastrec);
blockcount = xfs_bmbt_get_blockcount(lastrec); blockcount = xfs_bmbt_get_blockcount(lastrec);
*eof = endoff >= startoff + blockcount; *eof = endoff >= startoff + blockcount;
...@@ -5969,18 +5894,21 @@ xfs_bmap_check_extents( ...@@ -5969,18 +5894,21 @@ xfs_bmap_check_extents(
xfs_inode_t *ip, /* incore inode pointer */ xfs_inode_t *ip, /* incore inode pointer */
int whichfork) /* data or attr fork */ int whichfork) /* data or attr fork */
{ {
xfs_bmbt_rec_t *base; /* base of extents list */
xfs_bmbt_rec_t *ep; /* current extent entry */ xfs_bmbt_rec_t *ep; /* current extent entry */
xfs_extnum_t idx; /* extent record index */
xfs_ifork_t *ifp; /* inode fork pointer */ xfs_ifork_t *ifp; /* inode fork pointer */
xfs_extnum_t nextents; /* number of extents in list */ xfs_extnum_t nextents; /* number of extents in list */
xfs_bmbt_rec_t *nextp; /* next extent entry */
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
ASSERT(ifp->if_flags & XFS_IFEXTENTS); ASSERT(ifp->if_flags & XFS_IFEXTENTS);
base = ifp->if_u1.if_extents;
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t); nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
for (ep = base; ep < &base[nextents - 1]; ep++) { ep = xfs_iext_get_ext(ifp, 0);
for (idx = 0; idx < nextents - 1; idx++) {
nextp = xfs_iext_get_ext(ifp, idx + 1);
xfs_btree_check_rec(XFS_BTNUM_BMAP, (void *)ep, xfs_btree_check_rec(XFS_BTNUM_BMAP, (void *)ep,
(void *)(ep + 1)); (void *)(nextp));
ep = nextp;
} }
} }
...@@ -6119,12 +6047,14 @@ xfs_bmap_check_leaf_extents( ...@@ -6119,12 +6047,14 @@ xfs_bmap_check_leaf_extents(
xfs_fsblock_t bno; /* block # of "block" */ xfs_fsblock_t bno; /* block # of "block" */
xfs_buf_t *bp; /* buffer for "block" */ xfs_buf_t *bp; /* buffer for "block" */
int error; /* error return value */ int error; /* error return value */
xfs_extnum_t i=0; /* index into the extents list */ xfs_extnum_t i=0, j; /* index into the extents list */
xfs_ifork_t *ifp; /* fork structure */ xfs_ifork_t *ifp; /* fork structure */
int level; /* btree level, for checking */ int level; /* btree level, for checking */
xfs_mount_t *mp; /* file system mount structure */ xfs_mount_t *mp; /* file system mount structure */
xfs_bmbt_ptr_t *pp; /* pointer to block address */ xfs_bmbt_ptr_t *pp; /* pointer to block address */
xfs_bmbt_rec_t *ep, *lastp; /* extent pointers in block entry */ xfs_bmbt_rec_t *ep; /* pointer to current extent */
xfs_bmbt_rec_t *lastp; /* pointer to previous extent */
xfs_bmbt_rec_t *nextp; /* pointer to next extent */
int bp_release = 0; int bp_release = 0;
if (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE) { if (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE) {
...@@ -6194,7 +6124,6 @@ xfs_bmap_check_leaf_extents( ...@@ -6194,7 +6124,6 @@ xfs_bmap_check_leaf_extents(
*/ */
lastp = NULL; lastp = NULL;
for (;;) { for (;;) {
xfs_bmbt_rec_t *frp;
xfs_fsblock_t nextbno; xfs_fsblock_t nextbno;
xfs_extnum_t num_recs; xfs_extnum_t num_recs;
...@@ -6213,18 +6142,20 @@ xfs_bmap_check_leaf_extents( ...@@ -6213,18 +6142,20 @@ xfs_bmap_check_leaf_extents(
* conform with the first entry in this one. * conform with the first entry in this one.
*/ */
frp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_bmbt, ep = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_bmbt,
block, 1, mp->m_bmap_dmxr[0]); block, 1, mp->m_bmap_dmxr[0]);
for (j = 1; j < num_recs; j++) {
for (ep = frp;ep < frp + (num_recs - 1); ep++) { nextp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, xfs_bmbt,
block, j + 1, mp->m_bmap_dmxr[0]);
if (lastp) { if (lastp) {
xfs_btree_check_rec(XFS_BTNUM_BMAP, xfs_btree_check_rec(XFS_BTNUM_BMAP,
(void *)lastp, (void *)ep); (void *)lastp, (void *)ep);
} }
xfs_btree_check_rec(XFS_BTNUM_BMAP, (void *)ep, xfs_btree_check_rec(XFS_BTNUM_BMAP, (void *)ep,
(void *)(ep + 1)); (void *)(nextp));
lastp = ep;
ep = nextp;
} }
lastp = frp + num_recs - 1; /* For the next iteration */
i += num_recs; i += num_recs;
if (bp_release) { if (bp_release) {
...@@ -6288,7 +6219,7 @@ xfs_bmap_count_blocks( ...@@ -6288,7 +6219,7 @@ xfs_bmap_count_blocks(
mp = ip->i_mount; mp = ip->i_mount;
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
if ( XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_EXTENTS ) { if ( XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_EXTENTS ) {
if (unlikely(xfs_bmap_count_leaves(ifp->if_u1.if_extents, if (unlikely(xfs_bmap_count_leaves(ifp, 0,
ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t), ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t),
count) < 0)) { count) < 0)) {
XFS_ERROR_REPORT("xfs_bmap_count_blocks(1)", XFS_ERROR_REPORT("xfs_bmap_count_blocks(1)",
...@@ -6310,7 +6241,7 @@ xfs_bmap_count_blocks( ...@@ -6310,7 +6241,7 @@ xfs_bmap_count_blocks(
ASSERT(XFS_FSB_TO_AGBNO(mp, INT_GET(*pp, ARCH_CONVERT)) < mp->m_sb.sb_agblocks); ASSERT(XFS_FSB_TO_AGBNO(mp, INT_GET(*pp, ARCH_CONVERT)) < mp->m_sb.sb_agblocks);
bno = INT_GET(*pp, ARCH_CONVERT); bno = INT_GET(*pp, ARCH_CONVERT);
if (unlikely(xfs_bmap_count_tree(mp, tp, bno, level, count) < 0)) { if (unlikely(xfs_bmap_count_tree(mp, tp, ifp, bno, level, count) < 0)) {
XFS_ERROR_REPORT("xfs_bmap_count_blocks(2)", XFS_ERRLEVEL_LOW, XFS_ERROR_REPORT("xfs_bmap_count_blocks(2)", XFS_ERRLEVEL_LOW,
mp); mp);
return XFS_ERROR(EFSCORRUPTED); return XFS_ERROR(EFSCORRUPTED);
...@@ -6327,6 +6258,7 @@ int /* error */ ...@@ -6327,6 +6258,7 @@ int /* error */
xfs_bmap_count_tree( xfs_bmap_count_tree(
xfs_mount_t *mp, /* file system mount point */ xfs_mount_t *mp, /* file system mount point */
xfs_trans_t *tp, /* transaction pointer */ xfs_trans_t *tp, /* transaction pointer */
xfs_ifork_t *ifp, /* inode fork pointer */
xfs_fsblock_t blockno, /* file system block number */ xfs_fsblock_t blockno, /* file system block number */
int levelin, /* level in btree */ int levelin, /* level in btree */
int *count) /* Count of blocks */ int *count) /* Count of blocks */
...@@ -6339,7 +6271,6 @@ xfs_bmap_count_tree( ...@@ -6339,7 +6271,6 @@ xfs_bmap_count_tree(
xfs_fsblock_t nextbno; xfs_fsblock_t nextbno;
xfs_bmbt_block_t *block, *nextblock; xfs_bmbt_block_t *block, *nextblock;
int numrecs; int numrecs;
xfs_bmbt_rec_t *frp;
if ((error = xfs_btree_read_bufl(mp, tp, bno, 0, &bp, XFS_BMAP_BTREE_REF))) if ((error = xfs_btree_read_bufl(mp, tp, bno, 0, &bp, XFS_BMAP_BTREE_REF)))
return error; return error;
...@@ -6364,7 +6295,7 @@ xfs_bmap_count_tree( ...@@ -6364,7 +6295,7 @@ xfs_bmap_count_tree(
xfs_bmbt, block, 1, mp->m_bmap_dmxr[1]); xfs_bmbt, block, 1, mp->m_bmap_dmxr[1]);
bno = INT_GET(*pp, ARCH_CONVERT); bno = INT_GET(*pp, ARCH_CONVERT);
if (unlikely((error = if (unlikely((error =
xfs_bmap_count_tree(mp, tp, bno, level, count)) < 0)) { xfs_bmap_count_tree(mp, tp, ifp, bno, level, count)) < 0)) {
xfs_trans_brelse(tp, bp); xfs_trans_brelse(tp, bp);
XFS_ERROR_REPORT("xfs_bmap_count_tree(1)", XFS_ERROR_REPORT("xfs_bmap_count_tree(1)",
XFS_ERRLEVEL_LOW, mp); XFS_ERRLEVEL_LOW, mp);
...@@ -6376,9 +6307,8 @@ xfs_bmap_count_tree( ...@@ -6376,9 +6307,8 @@ xfs_bmap_count_tree(
for (;;) { for (;;) {
nextbno = be64_to_cpu(block->bb_rightsib); nextbno = be64_to_cpu(block->bb_rightsib);
numrecs = be16_to_cpu(block->bb_numrecs); numrecs = be16_to_cpu(block->bb_numrecs);
frp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize, if (unlikely(xfs_bmap_disk_count_leaves(ifp, mp,
xfs_bmbt, block, 1, mp->m_bmap_dmxr[0]); 0, block, numrecs, count) < 0)) {
if (unlikely(xfs_bmap_disk_count_leaves(frp, numrecs, count) < 0)) {
xfs_trans_brelse(tp, bp); xfs_trans_brelse(tp, bp);
XFS_ERROR_REPORT("xfs_bmap_count_tree(2)", XFS_ERROR_REPORT("xfs_bmap_count_tree(2)",
XFS_ERRLEVEL_LOW, mp); XFS_ERRLEVEL_LOW, mp);
...@@ -6399,33 +6329,45 @@ xfs_bmap_count_tree( ...@@ -6399,33 +6329,45 @@ xfs_bmap_count_tree(
} }
/* /*
* Count leaf blocks given a pointer to an extent list. * Count leaf blocks given a range of extent records.
*/ */
int int
xfs_bmap_count_leaves( xfs_bmap_count_leaves(
xfs_bmbt_rec_t *frp, xfs_ifork_t *ifp,
xfs_extnum_t idx,
int numrecs, int numrecs,
int *count) int *count)
{ {
int b; int b;
xfs_bmbt_rec_t *frp;
for ( b = 1; b <= numrecs; b++, frp++) for (b = 0; b < numrecs; b++) {
frp = xfs_iext_get_ext(ifp, idx + b);
*count += xfs_bmbt_get_blockcount(frp); *count += xfs_bmbt_get_blockcount(frp);
}
return 0; return 0;
} }
/* /*
* Count leaf blocks given a pointer to an extent list originally in btree format. * Count leaf blocks given a range of extent records originally
* in btree format.
*/ */
int int
xfs_bmap_disk_count_leaves( xfs_bmap_disk_count_leaves(
xfs_bmbt_rec_t *frp, xfs_ifork_t *ifp,
xfs_mount_t *mp,
xfs_extnum_t idx,
xfs_bmbt_block_t *block,
int numrecs, int numrecs,
int *count) int *count)
{ {
int b; int b;
xfs_bmbt_rec_t *frp;
for ( b = 1; b <= numrecs; b++, frp++) for (b = 1; b <= numrecs; b++) {
frp = XFS_BTREE_REC_ADDR(mp->m_sb.sb_blocksize,
xfs_bmbt, block, idx + b, mp->m_bmap_dmxr[0]);
*count += xfs_bmbt_disk_get_blockcount(frp); *count += xfs_bmbt_disk_get_blockcount(frp);
}
return 0; return 0;
} }
fs/xfs/xfs_bmap.h
View file @ 4eea22f0
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
struct getbmap; struct getbmap;
struct xfs_bmbt_irec; struct xfs_bmbt_irec;
struct xfs_ifork;
struct xfs_inode; struct xfs_inode;
struct xfs_mount; struct xfs_mount;
struct xfs_trans; struct xfs_trans;
...@@ -347,7 +348,8 @@ xfs_bmap_count_blocks( ...@@ -347,7 +348,8 @@ xfs_bmap_count_blocks(
*/ */
int int
xfs_check_nostate_extents( xfs_check_nostate_extents(
xfs_bmbt_rec_t *ep, struct xfs_ifork *ifp,
xfs_extnum_t idx,
xfs_extnum_t num); xfs_extnum_t num);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
fs/xfs/xfs_bmap_btree.c
View file @ 4eea22f0
...@@ -2754,7 +2754,7 @@ xfs_bmbt_update( ...@@ -2754,7 +2754,7 @@ xfs_bmbt_update(
} }
/* /*
* Check an extent list, which has just been read, for * Check extent records, which have just been read, for
* any bit in the extent flag field. ASSERT on debug * any bit in the extent flag field. ASSERT on debug
* kernels, as this condition should not occur. * kernels, as this condition should not occur.
* Return an error condition (1) if any flags found, * Return an error condition (1) if any flags found,
...@@ -2763,10 +2763,14 @@ xfs_bmbt_update( ...@@ -2763,10 +2763,14 @@ xfs_bmbt_update(
int int
xfs_check_nostate_extents( xfs_check_nostate_extents(
xfs_bmbt_rec_t *ep, xfs_ifork_t *ifp,
xfs_extnum_t idx,
xfs_extnum_t num) xfs_extnum_t num)
{ {
for (; num > 0; num--, ep++) { xfs_bmbt_rec_t *ep;
for (; num > 0; num--, idx++) {
ep = xfs_iext_get_ext(ifp, idx);
if ((ep->l0 >> if ((ep->l0 >>
(64 - BMBT_EXNTFLAG_BITLEN)) != 0) { (64 - BMBT_EXNTFLAG_BITLEN)) != 0) {
ASSERT(0); ASSERT(0);
......
fs/xfs/xfs_inode.c
View file @ 4eea22f0
...@@ -76,16 +76,18 @@ STATIC int xfs_iformat_btree(xfs_inode_t *, xfs_dinode_t *, int); ...@@ -76,16 +76,18 @@ STATIC int xfs_iformat_btree(xfs_inode_t *, xfs_dinode_t *, int);
*/ */
STATIC void STATIC void
xfs_validate_extents( xfs_validate_extents(
xfs_bmbt_rec_t *ep, xfs_ifork_t *ifp,
int nrecs, int nrecs,
int disk, int disk,
xfs_exntfmt_t fmt) xfs_exntfmt_t fmt)
{ {
xfs_bmbt_rec_t *ep;
xfs_bmbt_irec_t irec; xfs_bmbt_irec_t irec;
xfs_bmbt_rec_t rec; xfs_bmbt_rec_t rec;
int i; int i;
for (i = 0; i < nrecs; i++) { for (i = 0; i < nrecs; i++) {
ep = xfs_iext_get_ext(ifp, i);
rec.l0 = get_unaligned((__uint64_t*)&ep->l0); rec.l0 = get_unaligned((__uint64_t*)&ep->l0);
rec.l1 = get_unaligned((__uint64_t*)&ep->l1); rec.l1 = get_unaligned((__uint64_t*)&ep->l1);
if (disk) if (disk)
...@@ -94,11 +96,10 @@ xfs_validate_extents( ...@@ -94,11 +96,10 @@ xfs_validate_extents(
xfs_bmbt_get_all(&rec, &irec); xfs_bmbt_get_all(&rec, &irec);
if (fmt == XFS_EXTFMT_NOSTATE) if (fmt == XFS_EXTFMT_NOSTATE)
ASSERT(irec.br_state == XFS_EXT_NORM); ASSERT(irec.br_state == XFS_EXT_NORM);
ep++;
} }
} }
#else /* DEBUG */ #else /* DEBUG */
#define xfs_validate_extents(ep, nrecs, disk, fmt) #define xfs_validate_extents(ifp, nrecs, disk, fmt)
#endif /* DEBUG */ #endif /* DEBUG */
/* /*
...@@ -597,7 +598,6 @@ xfs_iformat_extents( ...@@ -597,7 +598,6 @@ xfs_iformat_extents(
xfs_bmbt_rec_t *ep, *dp; xfs_bmbt_rec_t *ep, *dp;
xfs_ifork_t *ifp; xfs_ifork_t *ifp;
int nex; int nex;
int real_size;
int size; int size;
int i; int i;
...@@ -619,23 +619,20 @@ xfs_iformat_extents( ...@@ -619,23 +619,20 @@ xfs_iformat_extents(
return XFS_ERROR(EFSCORRUPTED); return XFS_ERROR(EFSCORRUPTED);
} }
real_size = 0; ifp->if_real_bytes = 0;
if (nex == 0) if (nex == 0)
ifp->if_u1.if_extents = NULL; ifp->if_u1.if_extents = NULL;
else if (nex <= XFS_INLINE_EXTS) else if (nex <= XFS_INLINE_EXTS)
ifp->if_u1.if_extents = ifp->if_u2.if_inline_ext; ifp->if_u1.if_extents = ifp->if_u2.if_inline_ext;
else { else
ifp->if_u1.if_extents = kmem_alloc(size, KM_SLEEP); xfs_iext_add(ifp, 0, nex);
ASSERT(ifp->if_u1.if_extents != NULL);
real_size = size;
}
ifp->if_bytes = size; ifp->if_bytes = size;
ifp->if_real_bytes = real_size;
if (size) { if (size) {
dp = (xfs_bmbt_rec_t *) XFS_DFORK_PTR(dip, whichfork); dp = (xfs_bmbt_rec_t *) XFS_DFORK_PTR(dip, whichfork);
xfs_validate_extents(dp, nex, 1, XFS_EXTFMT_INODE(ip)); xfs_validate_extents(ifp, nex, 1, XFS_EXTFMT_INODE(ip));
ep = ifp->if_u1.if_extents; for (i = 0; i < nex; i++, dp++) {
for (i = 0; i < nex; i++, ep++, dp++) { ep = xfs_iext_get_ext(ifp, i);
ep->l0 = INT_GET(get_unaligned((__uint64_t*)&dp->l0), ep->l0 = INT_GET(get_unaligned((__uint64_t*)&dp->l0),
ARCH_CONVERT); ARCH_CONVERT);
ep->l1 = INT_GET(get_unaligned((__uint64_t*)&dp->l1), ep->l1 = INT_GET(get_unaligned((__uint64_t*)&dp->l1),
...@@ -646,7 +643,7 @@ xfs_iformat_extents( ...@@ -646,7 +643,7 @@ xfs_iformat_extents(
if (whichfork != XFS_DATA_FORK || if (whichfork != XFS_DATA_FORK ||
XFS_EXTFMT_INODE(ip) == XFS_EXTFMT_NOSTATE) XFS_EXTFMT_INODE(ip) == XFS_EXTFMT_NOSTATE)
if (unlikely(xfs_check_nostate_extents( if (unlikely(xfs_check_nostate_extents(
ifp->if_u1.if_extents, nex))) { ifp, 0, nex))) {
XFS_ERROR_REPORT("xfs_iformat_extents(2)", XFS_ERROR_REPORT("xfs_iformat_extents(2)",
XFS_ERRLEVEL_LOW, XFS_ERRLEVEL_LOW,
ip->i_mount); ip->i_mount);
...@@ -1015,6 +1012,7 @@ xfs_iread_extents( ...@@ -1015,6 +1012,7 @@ xfs_iread_extents(
{ {
int error; int error;
xfs_ifork_t *ifp; xfs_ifork_t *ifp;
xfs_extnum_t nextents;
size_t size; size_t size;
if (unlikely(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE)) { if (unlikely(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE)) {
...@@ -1022,26 +1020,24 @@ xfs_iread_extents( ...@@ -1022,26 +1020,24 @@ xfs_iread_extents(
ip->i_mount); ip->i_mount);
return XFS_ERROR(EFSCORRUPTED); return XFS_ERROR(EFSCORRUPTED);
} }
size = XFS_IFORK_NEXTENTS(ip, whichfork) * (uint)sizeof(xfs_bmbt_rec_t); nextents = XFS_IFORK_NEXTENTS(ip, whichfork);
size = nextents * sizeof(xfs_bmbt_rec_t);
ifp = XFS_IFORK_PTR(ip, whichfork); ifp = XFS_IFORK_PTR(ip, whichfork);
/* /*
* We know that the size is valid (it's checked in iformat_btree) * We know that the size is valid (it's checked in iformat_btree)
*/ */
ifp->if_u1.if_extents = kmem_alloc(size, KM_SLEEP);
ASSERT(ifp->if_u1.if_extents != NULL);
ifp->if_lastex = NULLEXTNUM; ifp->if_lastex = NULLEXTNUM;
ifp->if_bytes = ifp->if_real_bytes = (int)size; ifp->if_bytes = ifp->if_real_bytes = 0;
ifp->if_flags |= XFS_IFEXTENTS; ifp->if_flags |= XFS_IFEXTENTS;
xfs_iext_add(ifp, 0, nextents);
error = xfs_bmap_read_extents(tp, ip, whichfork); error = xfs_bmap_read_extents(tp, ip, whichfork);
if (error) { if (error) {
kmem_free(ifp->if_u1.if_extents, size); xfs_iext_destroy(ifp);
ifp->if_u1.if_extents = NULL;
ifp->if_bytes = ifp->if_real_bytes = 0;
ifp->if_flags &= ~XFS_IFEXTENTS; ifp->if_flags &= ~XFS_IFEXTENTS;
return error; return error;
} }
xfs_validate_extents((xfs_bmbt_rec_t *)ifp->if_u1.if_extents, xfs_validate_extents(ifp, nextents, 0, XFS_EXTFMT_INODE(ip));
XFS_IFORK_NEXTENTS(ip, whichfork), 0, XFS_EXTFMT_INODE(ip));
return 0; return 0;
} }
...@@ -2475,92 +2471,6 @@ xfs_iroot_realloc( ...@@ -2475,92 +2471,6 @@ xfs_iroot_realloc(
} }
/*
* This is called when the amount of space needed for if_extents
* is increased or decreased. The change in size is indicated by
* the number of extents that need to be added or deleted in the
* ext_diff parameter.
*
* If the amount of space needed has decreased below the size of the
* inline buffer, then switch to using the inline buffer. Otherwise,
* use kmem_realloc() or kmem_alloc() to adjust the size of the buffer
* to what is needed.
*
* ip -- the inode whose if_extents area is changing
* ext_diff -- the change in the number of extents, positive or negative,
* requested for the if_extents array.
*/
void
xfs_iext_realloc(
xfs_inode_t *ip,
int ext_diff,
int whichfork)
{
int byte_diff;
xfs_ifork_t *ifp;
int new_size;
uint rnew_size;
if (ext_diff == 0) {
return;
}
ifp = XFS_IFORK_PTR(ip, whichfork);
byte_diff = ext_diff * (uint)sizeof(xfs_bmbt_rec_t);
new_size = (int)ifp->if_bytes + byte_diff;
ASSERT(new_size >= 0);
if (new_size == 0) {
if (ifp->if_u1.if_extents != ifp->if_u2.if_inline_ext) {
ASSERT(ifp->if_real_bytes != 0);
kmem_free(ifp->if_u1.if_extents, ifp->if_real_bytes);
}
ifp->if_u1.if_extents = NULL;
rnew_size = 0;
} else if (new_size <= sizeof(ifp->if_u2.if_inline_ext)) {
/*
* If the valid extents can fit in if_inline_ext,
* copy them from the malloc'd vector and free it.
*/
if (ifp->if_u1.if_extents != ifp->if_u2.if_inline_ext) {
/*
* For now, empty files are format EXTENTS,
* so the if_extents pointer is null.
*/
if (ifp->if_u1.if_extents) {
memcpy(ifp->if_u2.if_inline_ext,
ifp->if_u1.if_extents, new_size);
kmem_free(ifp->if_u1.if_extents,
ifp->if_real_bytes);
}
ifp->if_u1.if_extents = ifp->if_u2.if_inline_ext;
}
rnew_size = 0;
} else {
rnew_size = new_size;
if ((rnew_size & (rnew_size - 1)) != 0)
rnew_size = xfs_iroundup(rnew_size);
/*
* Stuck with malloc/realloc.
*/
if (ifp->if_u1.if_extents == ifp->if_u2.if_inline_ext) {
ifp->if_u1.if_extents = (xfs_bmbt_rec_t *)
kmem_alloc(rnew_size, KM_SLEEP);
memcpy(ifp->if_u1.if_extents, ifp->if_u2.if_inline_ext,
sizeof(ifp->if_u2.if_inline_ext));
} else if (rnew_size != ifp->if_real_bytes) {
ifp->if_u1.if_extents = (xfs_bmbt_rec_t *)
kmem_realloc(ifp->if_u1.if_extents,
rnew_size,
ifp->if_real_bytes,
KM_NOFS);
}
}
ifp->if_real_bytes = rnew_size;
ifp->if_bytes = new_size;
}
/* /*
* This is called when the amount of space needed for if_data * This is called when the amount of space needed for if_data
* is increased or decreased. The change in size is indicated by * is increased or decreased. The change in size is indicated by
...@@ -2723,9 +2633,7 @@ xfs_idestroy_fork( ...@@ -2723,9 +2633,7 @@ xfs_idestroy_fork(
(ifp->if_u1.if_extents != NULL) && (ifp->if_u1.if_extents != NULL) &&
(ifp->if_u1.if_extents != ifp->if_u2.if_inline_ext)) { (ifp->if_u1.if_extents != ifp->if_u2.if_inline_ext)) {
ASSERT(ifp->if_real_bytes != 0); ASSERT(ifp->if_real_bytes != 0);
kmem_free(ifp->if_u1.if_extents, ifp->if_real_bytes); xfs_iext_destroy(ifp);
ifp->if_u1.if_extents = NULL;
ifp->if_real_bytes = 0;
} }
ASSERT(ifp->if_u1.if_extents == NULL || ASSERT(ifp->if_u1.if_extents == NULL ||
ifp->if_u1.if_extents == ifp->if_u2.if_inline_ext); ifp->if_u1.if_extents == ifp->if_u2.if_inline_ext);
...@@ -2902,16 +2810,15 @@ xfs_iextents_copy( ...@@ -2902,16 +2810,15 @@ xfs_iextents_copy(
* the delayed ones. There must be at least one * the delayed ones. There must be at least one
* non-delayed extent. * non-delayed extent.
*/ */
ep = ifp->if_u1.if_extents;
dest_ep = buffer; dest_ep = buffer;
copied = 0; copied = 0;
for (i = 0; i < nrecs; i++) { for (i = 0; i < nrecs; i++) {
ep = xfs_iext_get_ext(ifp, i);
start_block = xfs_bmbt_get_startblock(ep); start_block = xfs_bmbt_get_startblock(ep);
if (ISNULLSTARTBLOCK(start_block)) { if (ISNULLSTARTBLOCK(start_block)) {
/* /*
* It's a delayed allocation extent, so skip it. * It's a delayed allocation extent, so skip it.
*/ */
ep++;
continue; continue;
} }
...@@ -2921,11 +2828,10 @@ xfs_iextents_copy( ...@@ -2921,11 +2828,10 @@ xfs_iextents_copy(
put_unaligned(INT_GET(ep->l1, ARCH_CONVERT), put_unaligned(INT_GET(ep->l1, ARCH_CONVERT),
(__uint64_t*)&dest_ep->l1); (__uint64_t*)&dest_ep->l1);
dest_ep++; dest_ep++;
ep++;
copied++; copied++;
} }
ASSERT(copied != 0); ASSERT(copied != 0);
xfs_validate_extents(buffer, copied, 1, XFS_EXTFMT_INODE(ip)); xfs_validate_extents(ifp, copied, 1, XFS_EXTFMT_INODE(ip));
return (copied * (uint)sizeof(xfs_bmbt_rec_t)); return (copied * (uint)sizeof(xfs_bmbt_rec_t));
} }
...@@ -2995,8 +2901,10 @@ xfs_iflush_fork( ...@@ -2995,8 +2901,10 @@ xfs_iflush_fork(
case XFS_DINODE_FMT_EXTENTS: case XFS_DINODE_FMT_EXTENTS:
ASSERT((ifp->if_flags & XFS_IFEXTENTS) || ASSERT((ifp->if_flags & XFS_IFEXTENTS) ||
!(iip->ili_format.ilf_fields & extflag[whichfork])); !(iip->ili_format.ilf_fields & extflag[whichfork]));
ASSERT((ifp->if_u1.if_extents != NULL) || (ifp->if_bytes == 0)); ASSERT((xfs_iext_get_ext(ifp, 0) != NULL) ||
ASSERT((ifp->if_u1.if_extents == NULL) || (ifp->if_bytes > 0)); (ifp->if_bytes == 0));
ASSERT((xfs_iext_get_ext(ifp, 0) == NULL) ||
(ifp->if_bytes > 0));
if ((iip->ili_format.ilf_fields & extflag[whichfork]) && if ((iip->ili_format.ilf_fields & extflag[whichfork]) &&
(ifp->if_bytes > 0)) { (ifp->if_bytes > 0)) {
ASSERT(XFS_IFORK_NEXTENTS(ip, whichfork) > 0); ASSERT(XFS_IFORK_NEXTENTS(ip, whichfork) > 0);
...@@ -3704,3 +3612,327 @@ xfs_ilock_trace(xfs_inode_t *ip, int lock, unsigned int lockflags, inst_t *ra) ...@@ -3704,3 +3612,327 @@ xfs_ilock_trace(xfs_inode_t *ip, int lock, unsigned int lockflags, inst_t *ra)
NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
} }
#endif #endif
/*
* Return a pointer to the extent record at file index idx.
*/
xfs_bmbt_rec_t *
xfs_iext_get_ext(
xfs_ifork_t *ifp, /* inode fork pointer */
xfs_extnum_t idx) /* index of target extent */
{
ASSERT(idx >= 0);
if (ifp->if_bytes) {
return &ifp->if_u1.if_extents[idx];
} else {
return NULL;
}
}
/*
* Insert new item(s) into the extent records for incore inode
* fork 'ifp'. 'count' new items are inserted at index 'idx'.
*/
void
xfs_iext_insert(
xfs_ifork_t *ifp, /* inode fork pointer */
xfs_extnum_t idx, /* starting index of new items */
xfs_extnum_t count, /* number of inserted items */
xfs_bmbt_irec_t *new) /* items to insert */
{
xfs_bmbt_rec_t *ep; /* extent record pointer */
xfs_extnum_t i; /* extent record index */
ASSERT(ifp->if_flags & XFS_IFEXTENTS);
xfs_iext_add(ifp, idx, count);
for (i = idx; i < idx + count; i++, new++) {
ep = xfs_iext_get_ext(ifp, i);
xfs_bmbt_set_all(ep, new);
}
}
/*
* This is called when the amount of space required for incore file
* extents needs to be increased. The ext_diff parameter stores the
* number of new extents being added and the idx parameter contains
* the extent index where the new extents will be added. If the new
* extents are being appended, then we just need to (re)allocate and
* initialize the space. Otherwise, if the new extents are being
* inserted into the middle of the existing entries, a bit more work
* is required to make room for the new extents to be inserted. The
* caller is responsible for filling in the new extent entries upon
* return.
*/
void
xfs_iext_add(
xfs_ifork_t *ifp, /* inode fork pointer */
xfs_extnum_t idx, /* index to begin adding exts */
int ext_diff) /* nubmer of extents to add */
{
int byte_diff; /* new bytes being added */
int new_size; /* size of extents after adding */
xfs_extnum_t nextents; /* number of extents in file */
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
ASSERT((idx >= 0) && (idx <= nextents));
byte_diff = ext_diff * sizeof(xfs_bmbt_rec_t);
new_size = ifp->if_bytes + byte_diff;
/*
* If the new number of extents (nextents + ext_diff)
* fits inside the inode, then continue to use the inline
* extent buffer.
*/
if (nextents + ext_diff <= XFS_INLINE_EXTS) {
if (idx < nextents) {
memmove(&ifp->if_u2.if_inline_ext[idx + ext_diff],
&ifp->if_u2.if_inline_ext[idx],
(nextents - idx) * sizeof(xfs_bmbt_rec_t));
memset(&ifp->if_u2.if_inline_ext[idx], 0, byte_diff);
}
ifp->if_u1.if_extents = ifp->if_u2.if_inline_ext;
ifp->if_real_bytes = 0;
}
/*
* Otherwise use a linear (direct) extent list.
* If the extents are currently inside the inode,
* xfs_iext_realloc_direct will switch us from
* inline to direct extent allocation mode.
*/
else {
xfs_iext_realloc_direct(ifp, new_size);
if (idx < nextents) {
memmove(&ifp->if_u1.if_extents[idx + ext_diff],
&ifp->if_u1.if_extents[idx],
(nextents - idx) * sizeof(xfs_bmbt_rec_t));
memset(&ifp->if_u1.if_extents[idx], 0, byte_diff);
}
}
ifp->if_bytes = new_size;
}
/*
* This is called when the amount of space required for incore file
* extents needs to be decreased. The ext_diff parameter stores the
* number of extents to be removed and the idx parameter contains
* the extent index where the extents will be removed from.
*/
void
xfs_iext_remove(
xfs_ifork_t *ifp, /* inode fork pointer */
xfs_extnum_t idx, /* index to begin removing exts */
int ext_diff) /* number of extents to remove */
{
xfs_extnum_t nextents; /* number of extents in file */
int new_size; /* size of extents after removal */
ASSERT(ext_diff > 0);
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
new_size = (nextents - ext_diff) * sizeof(xfs_bmbt_rec_t);
if (new_size == 0) {
xfs_iext_destroy(ifp);
} else if (ifp->if_real_bytes) {
xfs_iext_remove_direct(ifp, idx, ext_diff);
} else {
xfs_iext_remove_inline(ifp, idx, ext_diff);
}
ifp->if_bytes = new_size;
}
/*
* This removes ext_diff extents from the inline buffer, beginning
* at extent index idx.
*/
void
xfs_iext_remove_inline(
xfs_ifork_t *ifp, /* inode fork pointer */
xfs_extnum_t idx, /* index to begin removing exts */
int ext_diff) /* number of extents to remove */
{
int nextents; /* number of extents in file */
ASSERT(idx < XFS_INLINE_EXTS);
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
ASSERT(((nextents - ext_diff) > 0) &&
(nextents - ext_diff) < XFS_INLINE_EXTS);
if (idx + ext_diff < nextents) {
memmove(&ifp->if_u2.if_inline_ext[idx],
&ifp->if_u2.if_inline_ext[idx + ext_diff],
(nextents - (idx + ext_diff)) *
sizeof(xfs_bmbt_rec_t));
memset(&ifp->if_u2.if_inline_ext[nextents - ext_diff],
0, ext_diff * sizeof(xfs_bmbt_rec_t));
} else {
memset(&ifp->if_u2.if_inline_ext[idx], 0,
ext_diff * sizeof(xfs_bmbt_rec_t));
}
}
/*
* This removes ext_diff extents from a linear (direct) extent list,
* beginning at extent index idx. If the extents are being removed
* from the end of the list (ie. truncate) then we just need to re-
* allocate the list to remove the extra space. Otherwise, if the
* extents are being removed from the middle of the existing extent
* entries, then we first need to move the extent records beginning
* at idx + ext_diff up in the list to overwrite the records being
* removed, then remove the extra space via kmem_realloc.
*/
void
xfs_iext_remove_direct(
xfs_ifork_t *ifp, /* inode fork pointer */
xfs_extnum_t idx, /* index to begin removing exts */
int ext_diff) /* number of extents to remove */
{
xfs_extnum_t nextents; /* number of extents in file */
int new_size; /* size of extents after removal */
new_size = ifp->if_bytes -
(ext_diff * sizeof(xfs_bmbt_rec_t));
nextents = ifp->if_bytes / (uint)sizeof(xfs_bmbt_rec_t);
if (new_size == 0) {
xfs_iext_destroy(ifp);
return;
}
/* Move extents up in the list (if needed) */
if (idx + ext_diff < nextents) {
memmove(&ifp->if_u1.if_extents[idx],
&ifp->if_u1.if_extents[idx + ext_diff],
(nextents - (idx + ext_diff)) *
sizeof(xfs_bmbt_rec_t));
}
memset(&ifp->if_u1.if_extents[nextents - ext_diff],
0, ext_diff * sizeof(xfs_bmbt_rec_t));
/*
* Reallocate the direct extent list. If the extents
* will fit inside the inode then xfs_iext_realloc_direct
* will switch from direct to inline extent allocation
* mode for us.
*/
xfs_iext_realloc_direct(ifp, new_size);
ifp->if_bytes = new_size;
}
/*
* Create, destroy, or resize a linear (direct) block of extents.
*/
void
xfs_iext_realloc_direct(
xfs_ifork_t *ifp, /* inode fork pointer */
int new_size) /* new size of extents */
{
int rnew_size; /* real new size of extents */
rnew_size = new_size;
/* Free extent records */
if (new_size == 0) {
xfs_iext_destroy(ifp);
}
/* Resize direct extent list and zero any new bytes */
else if (ifp->if_real_bytes) {
/* Check if extents will fit inside the inode */
if (new_size <= XFS_INLINE_EXTS * sizeof(xfs_bmbt_rec_t)) {
xfs_iext_direct_to_inline(ifp, new_size /
(uint)sizeof(xfs_bmbt_rec_t));
ifp->if_bytes = new_size;
return;
}
if ((new_size & (new_size - 1)) != 0) {
rnew_size = xfs_iroundup(new_size);
}
if (rnew_size != ifp->if_real_bytes) {
ifp->if_u1.if_extents = (xfs_bmbt_rec_t *)
kmem_realloc(ifp->if_u1.if_extents,
rnew_size,
ifp->if_real_bytes,
KM_SLEEP);
}
if (rnew_size > ifp->if_real_bytes) {
memset(&ifp->if_u1.if_extents[ifp->if_bytes /
(uint)sizeof(xfs_bmbt_rec_t)], 0,
rnew_size - ifp->if_real_bytes);
}
}
/*
* Switch from the inline extent buffer to a direct
* extent list. Be sure to include the inline extent
* bytes in new_size.
*/
else {
new_size += ifp->if_bytes;
if ((new_size & (new_size - 1)) != 0) {
rnew_size = xfs_iroundup(new_size);
}
xfs_iext_inline_to_direct(ifp, rnew_size);
}
ifp->if_real_bytes = rnew_size;
ifp->if_bytes = new_size;
}
/*
* Switch from linear (direct) extent records to inline buffer.
*/
void
xfs_iext_direct_to_inline(
xfs_ifork_t *ifp, /* inode fork pointer */
xfs_extnum_t nextents) /* number of extents in file */
{
ASSERT(ifp->if_flags & XFS_IFEXTENTS);
ASSERT(nextents <= XFS_INLINE_EXTS);
/*
* The inline buffer was zeroed when we switched
* from inline to direct extent allocation mode,
* so we don't need to clear it here.
*/
memcpy(ifp->if_u2.if_inline_ext, ifp->if_u1.if_extents,
nextents * sizeof(xfs_bmbt_rec_t));
kmem_free(ifp->if_u1.if_extents, KM_SLEEP);
ifp->if_u1.if_extents = ifp->if_u2.if_inline_ext;
ifp->if_real_bytes = 0;
}
/*
* Switch from inline buffer to linear (direct) extent records.
* new_size should already be rounded up to the next power of 2
* by the caller (when appropriate), so use new_size as it is.
* However, since new_size may be rounded up, we can't update
* if_bytes here. It is the caller's responsibility to update
* if_bytes upon return.
*/
void
xfs_iext_inline_to_direct(
xfs_ifork_t *ifp, /* inode fork pointer */
int new_size) /* number of extents in file */
{
ifp->if_u1.if_extents = (xfs_bmbt_rec_t *)
kmem_alloc(new_size, KM_SLEEP);
memset(ifp->if_u1.if_extents, 0, new_size);
if (ifp->if_bytes) {
memcpy(ifp->if_u1.if_extents, ifp->if_u2.if_inline_ext,
ifp->if_bytes);
memset(ifp->if_u2.if_inline_ext, 0, XFS_INLINE_EXTS *
sizeof(xfs_bmbt_rec_t));
}
ifp->if_real_bytes = new_size;
}
/*
* Free incore file extents.
*/
void
xfs_iext_destroy(
xfs_ifork_t *ifp) /* inode fork pointer */
{
if (ifp->if_real_bytes) {
kmem_free(ifp->if_u1.if_extents, ifp->if_real_bytes);
} else if (ifp->if_bytes) {
memset(ifp->if_u2.if_inline_ext, 0, XFS_INLINE_EXTS *
sizeof(xfs_bmbt_rec_t));
}
ifp->if_u1.if_extents = NULL;
ifp->if_real_bytes = 0;
ifp->if_bytes = 0;
}
fs/xfs/xfs_inode.h
View file @ 4eea22f0
...@@ -70,12 +70,6 @@ typedef struct xfs_ifork { ...@@ -70,12 +70,6 @@ typedef struct xfs_ifork {
*/ */
#define XFS_IMAP_LOOKUP 0x1 #define XFS_IMAP_LOOKUP 0x1
/*
* Maximum number of extent pointers in if_u1.if_extents.
*/
#define XFS_MAX_INCORE_EXTENTS 32768
#ifdef __KERNEL__ #ifdef __KERNEL__
struct bhv_desc; struct bhv_desc;
struct cred; struct cred;
...@@ -440,6 +434,18 @@ xfs_inode_t *xfs_vtoi(struct vnode *vp); ...@@ -440,6 +434,18 @@ xfs_inode_t *xfs_vtoi(struct vnode *vp);
void xfs_synchronize_atime(xfs_inode_t *); void xfs_synchronize_atime(xfs_inode_t *);
xfs_bmbt_rec_t *xfs_iext_get_ext(xfs_ifork_t *, xfs_extnum_t);
void xfs_iext_insert(xfs_ifork_t *, xfs_extnum_t, xfs_extnum_t,
xfs_bmbt_irec_t *);
void xfs_iext_add(xfs_ifork_t *, xfs_extnum_t, int);
void xfs_iext_remove(xfs_ifork_t *, xfs_extnum_t, int);
void xfs_iext_remove_inline(xfs_ifork_t *, xfs_extnum_t, int);
void xfs_iext_remove_direct(xfs_ifork_t *, xfs_extnum_t, int);
void xfs_iext_realloc_direct(xfs_ifork_t *, int);
void xfs_iext_direct_to_inline(xfs_ifork_t *, xfs_extnum_t);
void xfs_iext_inline_to_direct(xfs_ifork_t *, int);
void xfs_iext_destroy(xfs_ifork_t *);
#define xfs_ipincount(ip) ((unsigned int) atomic_read(&ip->i_pincount)) #define xfs_ipincount(ip) ((unsigned int) atomic_read(&ip->i_pincount))
#ifdef DEBUG #ifdef DEBUG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7