mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 01:40:30 +00:00
xfs: remove the first extent special case in xfs_bmap_add_extent
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>
This commit is contained in:
parent
ed32201e65
commit
e7455e02e5
@ -465,27 +465,10 @@ xfs_bmap_add_extent(
|
|||||||
ASSERT(*idx >= 0);
|
ASSERT(*idx >= 0);
|
||||||
ASSERT(*idx <= nextents);
|
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.
|
* Any kind of new delayed allocation goes here.
|
||||||
*/
|
*/
|
||||||
else if (isnullstartblock(new->br_startblock)) {
|
if (isnullstartblock(new->br_startblock)) {
|
||||||
if (cur)
|
if (cur)
|
||||||
ASSERT((cur->bc_private.b.flags &
|
ASSERT((cur->bc_private.b.flags &
|
||||||
XFS_BTCUR_BPRV_WASDEL) == 0);
|
XFS_BTCUR_BPRV_WASDEL) == 0);
|
||||||
|
Loading…
Reference in New Issue
Block a user