Skip to content

Commit

Permalink
xfs: remote attribute allocation may be contiguous
Browse files Browse the repository at this point in the history
When CRCs are enabled, there may be multiple allocations made if the
headers cause a length overflow. This, however, does not mean that
the number of headers required increases, as the second and
subsequent extents may be contiguous with the previous extent. Hence
when we map the extents to write the attribute data, we may end up
with less extents than allocations made. Hence the assertion that we
consume the number of headers we calculated in the allocation loop
is incorrect and needs to be removed.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
  • Loading branch information
Dave Chinner authored and Ben Myers committed May 21, 2013
1 parent f648167 commit 90253cf
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion fs/xfs/xfs_attr_remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,11 @@ xfs_attr_rmtval_set(
* into requiring more blocks. e.g. for 512 byte blocks, we'll
* spill for another block every 9 headers we require in this
* loop.
*
* Note that this can result in contiguous allocation of blocks,
* so we don't use all the space we allocate for headers as we
* have one less header for each contiguous allocation that
* occurs in the map/write loop below.
*/
if (crcs && blkcnt == 0) {
int total_len;
Expand Down Expand Up @@ -439,7 +444,6 @@ xfs_attr_rmtval_set(
lblkno += map.br_blockcount;
}
ASSERT(valuelen == 0);
ASSERT(hdrcnt == 0);
return 0;
}

Expand Down

0 comments on commit 90253cf

Please sign in to comment.