diff options
Diffstat (limited to 'fs/xfs/libxfs/xfs_bmap_btree.c')
-rw-r--r-- | fs/xfs/libxfs/xfs_bmap_btree.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c index 1637c37bfbaa..6282f6e708af 100644 --- a/fs/xfs/libxfs/xfs_bmap_btree.c +++ b/fs/xfs/libxfs/xfs_bmap_btree.c | |||
@@ -461,7 +461,7 @@ xfs_bmbt_alloc_block( | |||
461 | * reservation amount is insufficient then we may fail a | 461 | * reservation amount is insufficient then we may fail a |
462 | * block allocation here and corrupt the filesystem. | 462 | * block allocation here and corrupt the filesystem. |
463 | */ | 463 | */ |
464 | args.minleft = xfs_trans_get_block_res(args.tp); | 464 | args.minleft = args.tp->t_blk_res; |
465 | } else if (cur->bc_private.b.flist->xbf_low) { | 465 | } else if (cur->bc_private.b.flist->xbf_low) { |
466 | args.type = XFS_ALLOCTYPE_START_BNO; | 466 | args.type = XFS_ALLOCTYPE_START_BNO; |
467 | } else { | 467 | } else { |
@@ -470,7 +470,7 @@ xfs_bmbt_alloc_block( | |||
470 | 470 | ||
471 | args.minlen = args.maxlen = args.prod = 1; | 471 | args.minlen = args.maxlen = args.prod = 1; |
472 | args.wasdel = cur->bc_private.b.flags & XFS_BTCUR_BPRV_WASDEL; | 472 | args.wasdel = cur->bc_private.b.flags & XFS_BTCUR_BPRV_WASDEL; |
473 | if (!args.wasdel && xfs_trans_get_block_res(args.tp) == 0) { | 473 | if (!args.wasdel && args.tp->t_blk_res == 0) { |
474 | error = -ENOSPC; | 474 | error = -ENOSPC; |
475 | goto error0; | 475 | goto error0; |
476 | } | 476 | } |
@@ -531,7 +531,6 @@ xfs_bmbt_free_block( | |||
531 | 531 | ||
532 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); | 532 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); |
533 | xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, -1L); | 533 | xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, -1L); |
534 | xfs_trans_binval(tp, bp); | ||
535 | return 0; | 534 | return 0; |
536 | } | 535 | } |
537 | 536 | ||