xfs: use new extent lookup helpers in xfs_bmapi_read
Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
parent
86685f7ba5
commit
334f3423d6
|
@ -4145,12 +4145,11 @@ xfs_bmapi_read(
|
||||||
struct xfs_mount *mp = ip->i_mount;
|
struct xfs_mount *mp = ip->i_mount;
|
||||||
struct xfs_ifork *ifp;
|
struct xfs_ifork *ifp;
|
||||||
struct xfs_bmbt_irec got;
|
struct xfs_bmbt_irec got;
|
||||||
struct xfs_bmbt_irec prev;
|
|
||||||
xfs_fileoff_t obno;
|
xfs_fileoff_t obno;
|
||||||
xfs_fileoff_t end;
|
xfs_fileoff_t end;
|
||||||
xfs_extnum_t lastx;
|
xfs_extnum_t idx;
|
||||||
int error;
|
int error;
|
||||||
int eof;
|
bool eof = false;
|
||||||
int n = 0;
|
int n = 0;
|
||||||
int whichfork = xfs_bmapi_whichfork(flags);
|
int whichfork = xfs_bmapi_whichfork(flags);
|
||||||
|
|
||||||
|
@ -4190,7 +4189,8 @@ xfs_bmapi_read(
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
xfs_bmap_search_extents(ip, bno, whichfork, &eof, &lastx, &got, &prev);
|
if (!xfs_iext_lookup_extent(ip, ifp, bno, &idx, &got))
|
||||||
|
eof = true;
|
||||||
end = bno + len;
|
end = bno + len;
|
||||||
obno = bno;
|
obno = bno;
|
||||||
|
|
||||||
|
@ -4221,10 +4221,8 @@ xfs_bmapi_read(
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* Else go on to the next record. */
|
/* Else go on to the next record. */
|
||||||
if (++lastx < xfs_iext_count(ifp))
|
if (!xfs_iext_get_extent(ifp, ++idx, &got))
|
||||||
xfs_bmbt_get_all(xfs_iext_get_ext(ifp, lastx), &got);
|
eof = true;
|
||||||
else
|
|
||||||
eof = 1;
|
|
||||||
}
|
}
|
||||||
*nmap = n;
|
*nmap = n;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue