diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-08-19 03:10:47 +0300 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-08-19 03:10:47 +0300 |
| commit | 5be203ad115c1d8294e8685253e05fcea0202e04 (patch) | |
| tree | fb30d691376436a934ab117fa8d5ff4a8f5bc508 /fs/xfs/libxfs | |
| parent | 5461ad99cab98d19f2570c468cdd6c42b6d66795 (diff) | |
| parent | d4a97a04227d5ba91b91888a016e2300861cfbc7 (diff) | |
| download | linux-5be203ad115c1d8294e8685253e05fcea0202e04.tar.xz | |
Merge branch 'xfs-efi-rework' into for-next
Diffstat (limited to 'fs/xfs/libxfs')
| -rw-r--r-- | fs/xfs/libxfs/xfs_bmap.c | 1 | ||||
| -rw-r--r-- | fs/xfs/libxfs/xfs_ialloc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 63e05b663380..8e2010d53b07 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -5945,6 +5945,7 @@ xfs_bmap_split_extent( return xfs_trans_commit(tp); out: + xfs_bmap_cancel(&free_list); xfs_trans_cancel(tp); return error; } diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index ce63e0431f3e..54deb2d12ac6 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -2233,7 +2233,7 @@ xfs_imap_lookup( } xfs_trans_brelse(tp, agbp); - xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR); + xfs_btree_del_cursor(cur, error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR); if (error) return error; |