Skip to contentSkip to conversation

btrfs: a few cleanups for update_ref_for_cow()

PATCH In review [email protected] 2 participants 4 messages Jun 18, 2024 – Jun 19, 2024 Btrfs file system

lore
Share & tools
lore
#0 lore raw

cover btrfs: a few cleanups for update_ref_for_cow()

From: Filipe Manana <[email protected]>

Detais in the change logs, trivial changes.

Filipe Manana (2):
btrfs: simplify setting the full backref flag at update_ref_for_cow()
btrfs: replace BUG_ON() with error handling at update_ref_for_cow()

 fs/btrfs/ctree.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/2 btrfs: simplify setting the full backref flag at update_ref_for_cow()

From: Filipe Manana <[email protected]>

We keep a "new_flags" variable only to keep track if we need to update the metadata extent's flags, and when we set BTRFS_BLOCK_FLAG_FULL_BACKREF in the variable, we do it in an inner scope. Then check in an outer scope if the variable is not 0 and if so call btrfs_set_disk_extent_flags(). The variable isn't used for anything else. This is somewhat confusing, so to make it more straightforward update the extent's flags where we are currently updating "new_flags" and remove the variable.

---
 fs/btrfs/ctree.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
fs/btrfs/ctree.c +4 -7
index 763b9a1da428..7b2f1de845e7 100644
@@ -417,7 +417,6 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
 	u64 refs;
 	u64 owner;
 	u64 flags;
-	u64 new_flags = 0;
 	int ret;
 
 	/*
@@ -481,7 +480,10 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
 				if (ret)
 					return ret;
 			}
-			new_flags |= BTRFS_BLOCK_FLAG_FULL_BACKREF;
+			ret = btrfs_set_disk_extent_flags(trans, buf,
+						  BTRFS_BLOCK_FLAG_FULL_BACKREF);
+			if (ret)
+				return ret;
 		} else {
 
 			if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)
@@ -491,11 +493,6 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
 			if (ret)
 				return ret;
 		}
-		if (new_flags != 0) {
-			ret = btrfs_set_disk_extent_flags(trans, buf, new_flags);
-			if (ret)
-				return ret;
-		}
 	} else {
 		if (flags & BTRFS_BLOCK_FLAG_FULL_BACKREF) {
 			if (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID)
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/2 btrfs: replace BUG_ON() with error handling at update_ref_for_cow()

In reply to [email protected]

From: Filipe Manana <[email protected]>

Instead of a BUG_ON() just return an error, log an error message and abort the transaction in case we find an extent buffer belonging to the relocation tree that doesn't have the full backref flag set. This is unexpected and should never happen (save for bugs or a potential bad memory).

---
 fs/btrfs/ctree.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +10 -2
index 7b2f1de845e7..e33f9f5a228d 100644
@@ -461,8 +461,16 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
 	}
 
 	owner = btrfs_header_owner(buf);
-	BUG_ON(owner == BTRFS_TREE_RELOC_OBJECTID &&
-	       !(flags & BTRFS_BLOCK_FLAG_FULL_BACKREF));
+	if (unlikely(owner == BTRFS_TREE_RELOC_OBJECTID &&
+		     !(flags & BTRFS_BLOCK_FLAG_FULL_BACKREF))) {
+		btrfs_crit(fs_info,
+"found tree block at bytenr %llu level %d root %llu refs %llu flags %llx without full backref flag set",
+			   buf->start, btrfs_header_level(buf),
+			   btrfs_root_id(root), refs, flags);
+		ret = -EUCLEAN;
+		btrfs_abort_transaction(trans, ret);
+		return ret;
+	}
 
 	if (refs > 1) {
 		if ((owner == btrfs_root_id(root) ||
Signature · 1 line
2.43.0
Reviewed-by on the v1 series
#3 lore raw
In reply to [email protected]
Quoted 3 lines · 在 2024/6/19 00:44, [email protected] 写道:

From: Filipe Manana <[email protected]>

Detais in the change logs, trivial changes.

Thanks,
Qu

Quoted 8 lines

Filipe Manana (2):
btrfs: simplify setting the full backref flag at update_ref_for_cow()
btrfs: replace BUG_ON() with error handling at update_ref_for_cow()

  fs/btrfs/ctree.c | 23 ++++++++++++++---------
  1 file changed, 14 insertions(+), 9 deletions(-)