Skip to contentSkip to conversation

btrfs: unfold transaction aborts for bg delete and get rid of a BUG_ON()

PATCH In review [email protected] 2 participants 4 messages Jan 23 – Jan 27 Btrfs file system

lore
Share & tools
lore
#0 lore raw

cover btrfs: unfold transaction aborts for bg delete and get rid of a BUG_ON()

From: Filipe Manana <[email protected]>

Simple changes, details in the change logs.

Filipe Manana (2):
btrfs: abort transaction on error in btrfs_remove_block_group()
btrfs: do not BUG_ON() in btrfs_remove_block_group()

 fs/btrfs/block-group.c | 26 ++++++++++++++++++++------
 fs/btrfs/volumes.c     |  7 +++----
 2 files changed, 23 insertions(+), 10 deletions(-)
Signature · 1 line
2.47.2
#1 lore raw

PATCH 1/2 btrfs: abort transaction on error in btrfs_remove_block_group()

From: Filipe Manana <[email protected]>

When btrfs_remove_block_group() fails we abort the transaction in its single caller (btrfs_remove_chunk()). This makes it harder to find out where exactly the failure happened, as several steps inside btrfs_remove_block_group() can fail.

So make btrfs_remove_block_group() abort the transaction whenever an error happens, instead of aborting in its caller.

---
 fs/btrfs/block-group.c | 19 ++++++++++++++-----
 fs/btrfs/volumes.c     |  7 +++----
 2 files changed, 17 insertions(+), 9 deletions(-)
fs/btrfs/block-group.c +14 -5
index 3a0521236ecd..7b723571501e 100644
@@ -1108,8 +1108,10 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
 	bool remove_rsv = false;
 
 	block_group = btrfs_lookup_block_group(fs_info, map->start);
-	if (!block_group)
+	if (unlikely(!block_group)) {
+		btrfs_abort_transaction(trans, -ENOENT);
 		return -ENOENT;
+	}
 
 	BUG_ON(!block_group->ro && !(block_group->flags & BTRFS_BLOCK_GROUP_REMAPPED));
 
@@ -1143,8 +1145,9 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
 	btrfs_clear_data_reloc_bg(block_group);
 
 	path = btrfs_alloc_path();
-	if (!path) {
+	if (unlikely(!path)) {
 		ret = -ENOMEM;
+		btrfs_abort_transaction(trans, ret);
 		goto out;
 	}
 
@@ -1180,8 +1183,10 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
 	mutex_unlock(&trans->transaction->cache_write_mutex);
 
 	ret = btrfs_remove_free_space_inode(trans, inode, block_group);
-	if (ret)
+	if (unlikely(ret)) {
+		btrfs_abort_transaction(trans, ret);
 		goto out;
+	}
 
 	write_lock(&fs_info->block_group_cache_lock);
 	rb_erase_cached(&block_group->cache_node,
@@ -1268,13 +1273,17 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
 	 */
 	if (!(block_group->flags & BTRFS_BLOCK_GROUP_REMAPPED)) {
 		ret = btrfs_remove_block_group_free_space(trans, block_group);
-		if (ret)
+		if (unlikely(ret)) {
+			btrfs_abort_transaction(trans, ret);
 			goto out;
+		}
 	}
 
 	ret = remove_block_group_item(trans, path, block_group);
-	if (ret < 0)
+	if (unlikely(ret < 0)) {
+		btrfs_abort_transaction(trans, ret);
 		goto out;
+	}
 
 	spin_lock(&block_group->lock);
 	/*
fs/btrfs/volumes.c +3 -4
index cff2412bc879..d33780082b8d 100644
@@ -3384,11 +3384,10 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
 	 */
 	btrfs_trans_release_chunk_metadata(trans);
 
+	/* On error, btrfs_remove_block_group() aborts the transaction. */
 	ret = btrfs_remove_block_group(trans, map);
-	if (unlikely(ret)) {
-		btrfs_abort_transaction(trans, ret);
-		goto out;
-	}
+	if (unlikely(ret))
+		ASSERT(BTRFS_FS_ERROR(fs_info) != 0);
 
 out:
 	if (trans->removing_chunk) {
Signature · 1 line
2.47.2
#2 lore raw

PATCH 2/2 btrfs: do not BUG_ON() in btrfs_remove_block_group()

In reply to [email protected]

From: Filipe Manana <[email protected]>

There's no need to BUG_ON(), we can just abort the transaction and return an error.

---
 fs/btrfs/block-group.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
fs/btrfs/block-group.c +6 -1
index 7b723571501e..3186ed4fd26d 100644
@@ -1113,7 +1113,12 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
 		return -ENOENT;
 	}
 
-	BUG_ON(!block_group->ro && !(block_group->flags & BTRFS_BLOCK_GROUP_REMAPPED));
+	if (unlikely(!block_group->ro &&
+		     !(block_group->flags & BTRFS_BLOCK_GROUP_REMAPPED))) {
+		ret = -EUCLEAN;
+		btrfs_abort_transaction(trans, ret);
+		goto out;
+	}
 
 	trace_btrfs_remove_block_group(block_group);
 	/*
Signature · 1 line
2.47.2
Reviewed-by on the v1 series
#3 lore raw
In reply to [email protected]
Quoted 4 lines · On 1/23/26 11:19 AM, [email protected] wrote:

From: Filipe Manana <[email protected]>

Simple changes, details in the change logs.

Quoted 8 lines

Filipe Manana (2):
btrfs: abort transaction on error in btrfs_remove_block_group()
btrfs: do not BUG_ON() in btrfs_remove_block_group()

  fs/btrfs/block-group.c | 26 ++++++++++++++++++++------
  fs/btrfs/volumes.c     |  7 +++----
  2 files changed, 23 insertions(+), 10 deletions(-)

+ if (unlikely(ret))
+ ASSERT(BTRFS_FS_ERROR(fs_info) != 0);

looks strange given ASSERT()s are a config option, but I've compiled it with and without and GCC didn't complain.

Anyways looks good,