mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 03:18:31 +00:00
xfs: use xfs_iext_get_extent instead of open coding it
This avoids exposure to details of the extent list implementation. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
parent
5e422f5e4f
commit
e3f0f7563e
2 changed files with 17 additions and 21 deletions
|
@ -1454,7 +1454,7 @@ xfs_bmap_last_extent(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, nextents - 1), rec);
|
xfs_iext_get_extent(ifp, nextents - 1, rec);
|
||||||
*is_empty = 0;
|
*is_empty = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1540,7 +1540,6 @@ xfs_bmap_one_block(
|
||||||
xfs_inode_t *ip, /* incore inode */
|
xfs_inode_t *ip, /* incore inode */
|
||||||
int whichfork) /* data or attr fork */
|
int whichfork) /* data or attr fork */
|
||||||
{
|
{
|
||||||
xfs_bmbt_rec_host_t *ep; /* ptr to fork's extent */
|
|
||||||
xfs_ifork_t *ifp; /* inode fork pointer */
|
xfs_ifork_t *ifp; /* inode fork pointer */
|
||||||
int rval; /* return value */
|
int rval; /* return value */
|
||||||
xfs_bmbt_irec_t s; /* internal version of extent */
|
xfs_bmbt_irec_t s; /* internal version of extent */
|
||||||
|
@ -1555,8 +1554,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 = xfs_iext_get_ext(ifp, 0);
|
xfs_iext_get_extent(ifp, 0, &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)
|
||||||
ASSERT(XFS_ISIZE(ip) == ip->i_mount->m_sb.sb_blocksize);
|
ASSERT(XFS_ISIZE(ip) == ip->i_mount->m_sb.sb_blocksize);
|
||||||
|
@ -1642,7 +1640,7 @@ xfs_bmap_add_extent_delay_real(
|
||||||
*/
|
*/
|
||||||
if (bma->idx > 0) {
|
if (bma->idx > 0) {
|
||||||
state |= BMAP_LEFT_VALID;
|
state |= BMAP_LEFT_VALID;
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, bma->idx - 1), &LEFT);
|
xfs_iext_get_extent(ifp, bma->idx - 1, &LEFT);
|
||||||
|
|
||||||
if (isnullstartblock(LEFT.br_startblock))
|
if (isnullstartblock(LEFT.br_startblock))
|
||||||
state |= BMAP_LEFT_DELAY;
|
state |= BMAP_LEFT_DELAY;
|
||||||
|
@ -1662,7 +1660,7 @@ xfs_bmap_add_extent_delay_real(
|
||||||
*/
|
*/
|
||||||
if (bma->idx < xfs_iext_count(ifp) - 1) {
|
if (bma->idx < xfs_iext_count(ifp) - 1) {
|
||||||
state |= BMAP_RIGHT_VALID;
|
state |= BMAP_RIGHT_VALID;
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, bma->idx + 1), &RIGHT);
|
xfs_iext_get_extent(ifp, bma->idx + 1, &RIGHT);
|
||||||
|
|
||||||
if (isnullstartblock(RIGHT.br_startblock))
|
if (isnullstartblock(RIGHT.br_startblock))
|
||||||
state |= BMAP_RIGHT_DELAY;
|
state |= BMAP_RIGHT_DELAY;
|
||||||
|
@ -2209,7 +2207,7 @@ xfs_bmap_add_extent_unwritten_real(
|
||||||
*/
|
*/
|
||||||
if (*idx > 0) {
|
if (*idx > 0) {
|
||||||
state |= BMAP_LEFT_VALID;
|
state |= BMAP_LEFT_VALID;
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, *idx - 1), &LEFT);
|
xfs_iext_get_extent(ifp, *idx - 1, &LEFT);
|
||||||
|
|
||||||
if (isnullstartblock(LEFT.br_startblock))
|
if (isnullstartblock(LEFT.br_startblock))
|
||||||
state |= BMAP_LEFT_DELAY;
|
state |= BMAP_LEFT_DELAY;
|
||||||
|
@ -2229,7 +2227,7 @@ xfs_bmap_add_extent_unwritten_real(
|
||||||
*/
|
*/
|
||||||
if (*idx < xfs_iext_count(ifp) - 1) {
|
if (*idx < xfs_iext_count(ifp) - 1) {
|
||||||
state |= BMAP_RIGHT_VALID;
|
state |= BMAP_RIGHT_VALID;
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, *idx + 1), &RIGHT);
|
xfs_iext_get_extent(ifp, *idx + 1, &RIGHT);
|
||||||
if (isnullstartblock(RIGHT.br_startblock))
|
if (isnullstartblock(RIGHT.br_startblock))
|
||||||
state |= BMAP_RIGHT_DELAY;
|
state |= BMAP_RIGHT_DELAY;
|
||||||
}
|
}
|
||||||
|
@ -2703,7 +2701,7 @@ xfs_bmap_add_extent_hole_delay(
|
||||||
*/
|
*/
|
||||||
if (*idx > 0) {
|
if (*idx > 0) {
|
||||||
state |= BMAP_LEFT_VALID;
|
state |= BMAP_LEFT_VALID;
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, *idx - 1), &left);
|
xfs_iext_get_extent(ifp, *idx - 1, &left);
|
||||||
|
|
||||||
if (isnullstartblock(left.br_startblock))
|
if (isnullstartblock(left.br_startblock))
|
||||||
state |= BMAP_LEFT_DELAY;
|
state |= BMAP_LEFT_DELAY;
|
||||||
|
@ -2715,7 +2713,7 @@ xfs_bmap_add_extent_hole_delay(
|
||||||
*/
|
*/
|
||||||
if (*idx < xfs_iext_count(ifp)) {
|
if (*idx < xfs_iext_count(ifp)) {
|
||||||
state |= BMAP_RIGHT_VALID;
|
state |= BMAP_RIGHT_VALID;
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, *idx), &right);
|
xfs_iext_get_extent(ifp, *idx, &right);
|
||||||
|
|
||||||
if (isnullstartblock(right.br_startblock))
|
if (isnullstartblock(right.br_startblock))
|
||||||
state |= BMAP_RIGHT_DELAY;
|
state |= BMAP_RIGHT_DELAY;
|
||||||
|
@ -2867,7 +2865,7 @@ xfs_bmap_add_extent_hole_real(
|
||||||
*/
|
*/
|
||||||
if (*idx > 0) {
|
if (*idx > 0) {
|
||||||
state |= BMAP_LEFT_VALID;
|
state |= BMAP_LEFT_VALID;
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, *idx - 1), &left);
|
xfs_iext_get_extent(ifp, *idx - 1, &left);
|
||||||
if (isnullstartblock(left.br_startblock))
|
if (isnullstartblock(left.br_startblock))
|
||||||
state |= BMAP_LEFT_DELAY;
|
state |= BMAP_LEFT_DELAY;
|
||||||
}
|
}
|
||||||
|
@ -2878,7 +2876,7 @@ xfs_bmap_add_extent_hole_real(
|
||||||
*/
|
*/
|
||||||
if (*idx < xfs_iext_count(ifp)) {
|
if (*idx < xfs_iext_count(ifp)) {
|
||||||
state |= BMAP_RIGHT_VALID;
|
state |= BMAP_RIGHT_VALID;
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, *idx), &right);
|
xfs_iext_get_extent(ifp, *idx, &right);
|
||||||
if (isnullstartblock(right.br_startblock))
|
if (isnullstartblock(right.br_startblock))
|
||||||
state |= BMAP_RIGHT_DELAY;
|
state |= BMAP_RIGHT_DELAY;
|
||||||
}
|
}
|
||||||
|
@ -4207,10 +4205,8 @@ xfs_bmapi_allocate(
|
||||||
if (bma->wasdel) {
|
if (bma->wasdel) {
|
||||||
bma->length = (xfs_extlen_t)bma->got.br_blockcount;
|
bma->length = (xfs_extlen_t)bma->got.br_blockcount;
|
||||||
bma->offset = bma->got.br_startoff;
|
bma->offset = bma->got.br_startoff;
|
||||||
if (bma->idx) {
|
if (bma->idx)
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, bma->idx - 1),
|
xfs_iext_get_extent(ifp, bma->idx - 1, &bma->prev);
|
||||||
&bma->prev);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
bma->length = XFS_FILBLKS_MIN(bma->length, MAXEXTLEN);
|
bma->length = XFS_FILBLKS_MIN(bma->length, MAXEXTLEN);
|
||||||
if (!bma->eof)
|
if (!bma->eof)
|
||||||
|
@ -4307,7 +4303,7 @@ xfs_bmapi_allocate(
|
||||||
* or xfs_bmap_add_extent_hole_real might have merged it into one of
|
* or xfs_bmap_add_extent_hole_real might have merged it into one of
|
||||||
* the neighbouring ones.
|
* the neighbouring ones.
|
||||||
*/
|
*/
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, bma->idx), &bma->got);
|
xfs_iext_get_extent(ifp, bma->idx, &bma->got);
|
||||||
|
|
||||||
ASSERT(bma->got.br_startoff <= bma->offset);
|
ASSERT(bma->got.br_startoff <= bma->offset);
|
||||||
ASSERT(bma->got.br_startoff + bma->got.br_blockcount >=
|
ASSERT(bma->got.br_startoff + bma->got.br_blockcount >=
|
||||||
|
@ -4388,7 +4384,7 @@ xfs_bmapi_convert_unwritten(
|
||||||
* xfs_bmap_add_extent_unwritten_real might have merged it into one
|
* xfs_bmap_add_extent_unwritten_real might have merged it into one
|
||||||
* of the neighbouring ones.
|
* of the neighbouring ones.
|
||||||
*/
|
*/
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, bma->idx), &bma->got);
|
xfs_iext_get_extent(ifp, bma->idx, &bma->got);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We may have combined previously unwritten space with written space,
|
* We may have combined previously unwritten space with written space,
|
||||||
|
@ -5587,8 +5583,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(xfs_iext_get_ext(
|
xfs_iext_get_extent(ifp, lastx,
|
||||||
ifp, lastx), &got);
|
&got);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -277,7 +277,7 @@ DECLARE_EVENT_CLASS(xfs_bmap_class,
|
||||||
struct xfs_bmbt_irec r;
|
struct xfs_bmbt_irec r;
|
||||||
|
|
||||||
ifp = xfs_iext_state_to_fork(ip, state);
|
ifp = xfs_iext_state_to_fork(ip, state);
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx), &r);
|
xfs_iext_get_extent(ifp, idx, &r);
|
||||||
__entry->dev = VFS_I(ip)->i_sb->s_dev;
|
__entry->dev = VFS_I(ip)->i_sb->s_dev;
|
||||||
__entry->ino = ip->i_ino;
|
__entry->ino = ip->i_ino;
|
||||||
__entry->idx = idx;
|
__entry->idx = idx;
|
||||||
|
|
Loading…
Reference in a new issue