Skip to content

Commit 162d053

Browse files
fdmananakdave
authored andcommitted
btrfs: do not BUG_ON() on ENOMEM when dropping extent items for a range
If we get -ENOMEM while dropping file extent items in a given range, at btrfs_drop_extents(), due to failure to allocate memory when attempting to increment the reference count for an extent or drop the reference count, we handle it with a BUG_ON(). This is excessive, instead we can simply abort the transaction and return the error to the caller. In fact most callers of btrfs_drop_extents(), directly or indirectly, already abort the transaction if btrfs_drop_extents() returns any error. Also, we already have error paths at btrfs_drop_extents() that may return -ENOMEM and in those cases we abort the transaction, like for example anything that changes the b+tree may return -ENOMEM due to a failure to allocate a new extent buffer when COWing an existing extent buffer, such as a call to btrfs_duplicate_item() for example. So replace the BUG_ON() calls with proper logic to abort the transaction and return the error. Reported-by: [email protected] Link: https://lore.kernel.org/linux-btrfs/[email protected]/ CC: [email protected] # 5.4+ Reviewed-by: Josef Bacik <[email protected]> Signed-off-by: Filipe Manana <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 1742e1c commit 162d053

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

fs/btrfs/file.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,10 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans,
380380
args->start - extent_offset,
381381
0, false);
382382
ret = btrfs_inc_extent_ref(trans, &ref);
383-
BUG_ON(ret); /* -ENOMEM */
383+
if (ret) {
384+
btrfs_abort_transaction(trans, ret);
385+
break;
386+
}
384387
}
385388
key.offset = args->start;
386389
}
@@ -467,7 +470,10 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans,
467470
key.offset - extent_offset, 0,
468471
false);
469472
ret = btrfs_free_extent(trans, &ref);
470-
BUG_ON(ret); /* -ENOMEM */
473+
if (ret) {
474+
btrfs_abort_transaction(trans, ret);
475+
break;
476+
}
471477
args->bytes_found += extent_end - key.offset;
472478
}
473479

0 commit comments

Comments
 (0)