Skip to content

Commit

Permalink
xfs: remove the first extent special case in xfs_bmap_add_extent
Browse files Browse the repository at this point in the history
Both xfs_bmap_add_extent_hole_delay and xfs_bmap_add_extent_hole_real
already contain code to handle the case where there is no extent to
merge with, which is effectively the same as the code duplicated here.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
  • Loading branch information
Christoph Hellwig authored and Alex Elder committed Oct 12, 2011
1 parent ed32201 commit e7455e0
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions fs/xfs/xfs_bmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -465,27 +465,10 @@ xfs_bmap_add_extent(
ASSERT(*idx >= 0);
ASSERT(*idx <= nextents);

/*
* This is the first extent added to a new/empty file.
* Special case this one, so other routines get to assume there are
* already extents in the list.
*/
if (nextents == 0) {
xfs_iext_insert(ip, *idx, 1, new,
whichfork == XFS_ATTR_FORK ? BMAP_ATTRFORK : 0);

ASSERT(cur == NULL);

if (!isnullstartblock(new->br_startblock)) {
XFS_IFORK_NEXT_SET(ip, whichfork, 1);
logflags = XFS_ILOG_CORE | xfs_ilog_fext(whichfork);
} else
logflags = 0;
}
/*
* Any kind of new delayed allocation goes here.
*/
else if (isnullstartblock(new->br_startblock)) {
if (isnullstartblock(new->br_startblock)) {
if (cur)
ASSERT((cur->bc_private.b.flags &
XFS_BTCUR_BPRV_WASDEL) == 0);
Expand Down

0 comments on commit e7455e0

Please sign in to comment.