Skip to contentSkip to conversation

btrfs: memset cur_trans->delayed_refs to zero

PATCH In review Alexandru Moise 2 participants 4 messages Sep 7, 2015 – Sep 22, 2015 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: memset cur_trans->delayed_refs to zero

Use memset() to null out the btrfs_delayed_ref_root of btrfs_transaction instead of setting all the members to 0 by hand.

---
Rather than setting each member of ->delayed_refs by hand we should adhere to the practice of using memset() calls to fill those memory locations with zeroes. We make an exception however for the rb_root and atomic_t variable to make room for change in future delayed_refs implementations.

 fs/btrfs/transaction.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
fs/btrfs/transaction.c +2 -6
index 8f259b3..e4f7dcb 100644
@@ -224,15 +224,11 @@ loop:
 	cur_trans->start_time = get_seconds();
 	cur_trans->dirty_bg_run = 0;
 
+	memset(&cur_trans->delayed_refs, 0, sizeof(cur_trans->delayed_refs));
+
 	cur_trans->delayed_refs.href_root = RB_ROOT;
 	cur_trans->delayed_refs.dirty_extent_root = RB_ROOT;
 	atomic_set(&cur_trans->delayed_refs.num_entries, 0);
-	cur_trans->delayed_refs.num_heads_ready = 0;
-	cur_trans->delayed_refs.pending_csums = 0;
-	cur_trans->delayed_refs.num_heads = 0;
-	cur_trans->delayed_refs.flushing = 0;
-	cur_trans->delayed_refs.run_delayed_start = 0;
-	cur_trans->delayed_refs.qgroup_to_skip = 0;
 
 	/*
 	 * although the tree mod log is per file system and not per transaction,
Signature · 1 line
1.9.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Alexandru Moise

Use memset() to null out the btrfs_delayed_ref_root of btrfs_transaction instead of setting all the members to 0 by hand.

Please use the versioning in patch subject so we know which version is the latest, like

[PATCH v4] btrfs: memset cur_trans->delayed_refs to zero

#2 lore raw
Quoted 4 lines · David Sterba
Quoted 3 lines · Alexandru Moise

Use memset() to null out the btrfs_delayed_ref_root of btrfs_transaction instead of setting all the members to 0 by hand.

Quoted 8 lines
Quoted 1 line

Please use the versioning in patch subject so we know which version is the latest, like

[PATCH v4] btrfs: memset cur_trans->delayed_refs to zero

Alright, do you want me to resend it with the different subject tag or shall I just keep that in mind for future patches?

#3 lore raw
Quoted 2 lines · Alexandru Moise

Alright, do you want me to resend it with the different subject tag or shall I just keep that in mind for future patches?

No need to resend.