xfs: split xfs_da3_node_read
Split xfs_da3_node_read into one variant that always looks up the daddr and doesn't accept holes, and one that already has a daddr at hand. This is in preparation of splitting up xfs_da_read_buf in a similar way. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:

committed by
Darrick J. Wong

parent
f3fcb314d1
commit
02c57f0a8b
@@ -233,7 +233,7 @@ xfs_attr3_node_inactive(
|
||||
* traversal of the tree so we may deal with many blocks
|
||||
* before we come back to this one.
|
||||
*/
|
||||
error = xfs_da3_node_read(*trans, dp, child_fsb, -1, &child_bp,
|
||||
error = xfs_da3_node_read(*trans, dp, child_fsb, &child_bp,
|
||||
XFS_ATTR_FORK);
|
||||
if (error)
|
||||
return error;
|
||||
@@ -280,8 +280,8 @@ xfs_attr3_node_inactive(
|
||||
if (i + 1 < ichdr.count) {
|
||||
struct xfs_da3_icnode_hdr phdr;
|
||||
|
||||
error = xfs_da3_node_read(*trans, dp, 0, parent_blkno,
|
||||
&bp, XFS_ATTR_FORK);
|
||||
error = xfs_da3_node_read_mapped(*trans, dp,
|
||||
parent_blkno, &bp, XFS_ATTR_FORK);
|
||||
if (error)
|
||||
return error;
|
||||
xfs_da3_node_hdr_from_disk(dp->i_mount, &phdr,
|
||||
@@ -322,7 +322,7 @@ xfs_attr3_root_inactive(
|
||||
* the extents in reverse order the extent containing
|
||||
* block 0 must still be there.
|
||||
*/
|
||||
error = xfs_da3_node_read(*trans, dp, 0, -1, &bp, XFS_ATTR_FORK);
|
||||
error = xfs_da3_node_read(*trans, dp, 0, &bp, XFS_ATTR_FORK);
|
||||
if (error)
|
||||
return error;
|
||||
blkno = bp->b_bn;
|
||||
|
Reference in New Issue
Block a user