diff options
author | Darrick J. Wong <darrick.wong@oracle.com> | 2016-08-02 21:15:38 -0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2016-08-02 21:15:38 -0400 |
commit | 3ab78df2a59a485f479d26852a060acfd8c4ecd7 (patch) | |
tree | bb2ebb0e9564d18e90b177ab91a8ce80dc7bb746 /fs/xfs/libxfs/xfs_bmap_btree.c | |
parent | 9749fee83f38fca8dbe67161a033db22e3c4a2dd (diff) |
xfs: rework xfs_bmap_free callers to use xfs_defer_ops
Restructure everything that used xfs_bmap_free to use xfs_defer_ops
instead. For now we'll just remove the old symbols and play some
cpp magic to make it work; in the next patch we'll actually rename
everything.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/libxfs/xfs_bmap_btree.c')
-rw-r--r-- | fs/xfs/libxfs/xfs_bmap_btree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c index 4f1a98e6fb54..1b7ba73428b4 100644 --- a/fs/xfs/libxfs/xfs_bmap_btree.c +++ b/fs/xfs/libxfs/xfs_bmap_btree.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include "xfs_trans_resv.h" | 23 | #include "xfs_trans_resv.h" |
24 | #include "xfs_bit.h" | 24 | #include "xfs_bit.h" |
25 | #include "xfs_mount.h" | 25 | #include "xfs_mount.h" |
26 | #include "xfs_defer.h" | ||
26 | #include "xfs_inode.h" | 27 | #include "xfs_inode.h" |
27 | #include "xfs_trans.h" | 28 | #include "xfs_trans.h" |
28 | #include "xfs_inode_item.h" | 29 | #include "xfs_inode_item.h" |
@@ -462,7 +463,7 @@ xfs_bmbt_alloc_block( | |||
462 | * block allocation here and corrupt the filesystem. | 463 | * block allocation here and corrupt the filesystem. |
463 | */ | 464 | */ |
464 | args.minleft = args.tp->t_blk_res; | 465 | args.minleft = args.tp->t_blk_res; |
465 | } else if (cur->bc_private.b.flist->xbf_low) { | 466 | } else if (cur->bc_private.b.flist->dop_low) { |
466 | args.type = XFS_ALLOCTYPE_START_BNO; | 467 | args.type = XFS_ALLOCTYPE_START_BNO; |
467 | } else { | 468 | } else { |
468 | args.type = XFS_ALLOCTYPE_NEAR_BNO; | 469 | args.type = XFS_ALLOCTYPE_NEAR_BNO; |
@@ -490,7 +491,7 @@ xfs_bmbt_alloc_block( | |||
490 | error = xfs_alloc_vextent(&args); | 491 | error = xfs_alloc_vextent(&args); |
491 | if (error) | 492 | if (error) |
492 | goto error0; | 493 | goto error0; |
493 | cur->bc_private.b.flist->xbf_low = 1; | 494 | cur->bc_private.b.flist->dop_low = true; |
494 | } | 495 | } |
495 | if (args.fsbno == NULLFSBLOCK) { | 496 | if (args.fsbno == NULLFSBLOCK) { |
496 | XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT); | 497 | XFS_BTREE_TRACE_CURSOR(cur, XBT_EXIT); |