|
@@ -798,9 +798,7 @@ try_another_ag:
|
|
|
*/
|
|
|
ASSERT(args.fsbno != NULLFSBLOCK);
|
|
|
ASSERT(*firstblock == NULLFSBLOCK ||
|
|
|
- args.agno == XFS_FSB_TO_AGNO(mp, *firstblock) ||
|
|
|
- (dfops->dop_low &&
|
|
|
- args.agno > XFS_FSB_TO_AGNO(mp, *firstblock)));
|
|
|
+ args.agno >= XFS_FSB_TO_AGNO(mp, *firstblock));
|
|
|
*firstblock = cur->bc_private.b.firstblock = args.fsbno;
|
|
|
cur->bc_private.b.allocated++;
|
|
|
ip->i_d.di_nblocks++;
|
|
@@ -3822,17 +3820,13 @@ xfs_bmap_btalloc(
|
|
|
* the first block that was allocated.
|
|
|
*/
|
|
|
ASSERT(*ap->firstblock == NULLFSBLOCK ||
|
|
|
- XFS_FSB_TO_AGNO(mp, *ap->firstblock) ==
|
|
|
- XFS_FSB_TO_AGNO(mp, args.fsbno) ||
|
|
|
- (ap->dfops->dop_low &&
|
|
|
- XFS_FSB_TO_AGNO(mp, *ap->firstblock) <
|
|
|
- XFS_FSB_TO_AGNO(mp, args.fsbno)));
|
|
|
+ XFS_FSB_TO_AGNO(mp, *ap->firstblock) <=
|
|
|
+ XFS_FSB_TO_AGNO(mp, args.fsbno));
|
|
|
|
|
|
ap->blkno = args.fsbno;
|
|
|
if (*ap->firstblock == NULLFSBLOCK)
|
|
|
*ap->firstblock = args.fsbno;
|
|
|
- ASSERT(nullfb || fb_agno == args.agno ||
|
|
|
- (ap->dfops->dop_low && fb_agno < args.agno));
|
|
|
+ ASSERT(nullfb || fb_agno <= args.agno);
|
|
|
ap->length = args.len;
|
|
|
if (!(ap->flags & XFS_BMAPI_COWFORK))
|
|
|
ap->ip->i_d.di_nblocks += args.len;
|
|
@@ -4754,13 +4748,9 @@ error0:
|
|
|
if (bma.cur) {
|
|
|
if (!error) {
|
|
|
ASSERT(*firstblock == NULLFSBLOCK ||
|
|
|
- XFS_FSB_TO_AGNO(mp, *firstblock) ==
|
|
|
+ XFS_FSB_TO_AGNO(mp, *firstblock) <=
|
|
|
XFS_FSB_TO_AGNO(mp,
|
|
|
- bma.cur->bc_private.b.firstblock) ||
|
|
|
- (dfops->dop_low &&
|
|
|
- XFS_FSB_TO_AGNO(mp, *firstblock) <
|
|
|
- XFS_FSB_TO_AGNO(mp,
|
|
|
- bma.cur->bc_private.b.firstblock)));
|
|
|
+ bma.cur->bc_private.b.firstblock));
|
|
|
*firstblock = bma.cur->bc_private.b.firstblock;
|
|
|
}
|
|
|
xfs_btree_del_cursor(bma.cur,
|