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.
Unified · Split
| @@ -380,7 +380,10 @@ next_slot: · 379 unmodified lines | |||
| 380 | args->start - extent_offset, | 380 | args->start - extent_offset, |
| 381 | 0, false); | 381 | 0, false); |
| 382 | ret = btrfs_inc_extent_ref(trans, &ref); | 382 | ret = btrfs_inc_extent_ref(trans, &ref); |
| 383 | BUG_ON(ret); /* -ENOMEM */ | 383 | if (ret) { |
| 384 | btrfs_abort_transaction(trans, ret); | ||
| 385 | break; | ||
| 386 | } | ||
| 384 | } | 387 | } |
| 385 | key.offset = args->start; | 388 | key.offset = args->start; |
| 386 | } | 389 | } |
| @@ -467,7 +470,10 @@ delete_extent_item: · 80 unmodified lines | |||
| 467 | key.offset - extent_offset, 0, | 470 | key.offset - extent_offset, 0, |
| 468 | false); | 471 | false); |
| 469 | ret = btrfs_free_extent(trans, &ref); | 472 | ret = btrfs_free_extent(trans, &ref); |
| 470 | BUG_ON(ret); /* -ENOMEM */ | 473 | if (ret) { |
| 474 | btrfs_abort_transaction(trans, ret); | ||
| 475 | break; | ||
| 476 | } | ||
| 471 | args->bytes_found += extent_end - key.offset; | 477 | args->bytes_found += extent_end - key.offset; |
| 472 | } | 478 | } |
| 473 | 479 | ||