diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:30:12 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:30:12 +1100 |
| commit | 6d247d47fbd6883f7096e0e672afbdba6286dbc4 (patch) | |
| tree | ef576302d9f0075bf77725132dd886f00443beec /fs/xfs/libxfs/xfs_ialloc_btree.c | |
| parent | acb3e26fc3652d43cb5cf07c311ed55f3aecf40e (diff) | |
| parent | af055e37a91d215d7174d0b84c86795ca81086a7 (diff) | |
| download | linux-6d247d47fbd6883f7096e0e672afbdba6286dbc4.tar.bz2 | |
Merge branch 'xfs-misc-fixes-4.6' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_ialloc_btree.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_ialloc_btree.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c index c679f3c05b63..89c21d771e35 100644 --- a/fs/xfs/libxfs/xfs_ialloc_btree.c +++ b/fs/xfs/libxfs/xfs_ialloc_btree.c @@ -125,16 +125,8 @@ xfs_inobt_free_block( struct xfs_btree_cur *cur, struct xfs_buf *bp) { - xfs_fsblock_t fsbno; - int error; - - fsbno = XFS_DADDR_TO_FSB(cur->bc_mp, XFS_BUF_ADDR(bp)); - error = xfs_free_extent(cur->bc_tp, fsbno, 1); - if (error) - return error; - - xfs_trans_binval(cur->bc_tp, bp); - return error; + return xfs_free_extent(cur->bc_tp, + XFS_DADDR_TO_FSB(cur->bc_mp, XFS_BUF_ADDR(bp)), 1); } STATIC int |