summaryrefslogtreecommitdiff
path: root/fs/xfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/libxfs/xfs_bmap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index e2d8cbd054fe..117083b1d1ae 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -2742,11 +2742,11 @@ xfs_bmap_add_extent_hole_real(
* left and on the right.
* Merge all three into a single extent record.
*/
- --*idx;
left.br_blockcount += new->br_blockcount + right.br_blockcount;
- xfs_iext_update_extent(ip, state, *idx, &left);
- xfs_iext_remove(ip, *idx + 1, 1, state);
+ xfs_iext_remove(ip, *idx, 1, state);
+ --*idx;
+ xfs_iext_update_extent(ip, state, *idx, &left);
XFS_IFORK_NEXT_SET(ip, whichfork,
XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
@@ -2778,10 +2778,10 @@ xfs_bmap_add_extent_hole_real(
* on the left.
* Merge the new allocation with the left neighbor.
*/
- --*idx;
old = left;
-
left.br_blockcount += new->br_blockcount;
+
+ --*idx;
xfs_iext_update_extent(ip, state, *idx, &left);
if (cur == NULL) {