Skip to contentSkip to conversation

btrfs: memset cur_trans->delayed_refs to zero

PATCH In review Alexandru Moise 2 participants 3 messages Sep 7, 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.

---
 fs/btrfs/transaction.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
fs/btrfs/transaction.c +6 -6
index 8f259b3..0581fb4 100644
@@ -224,15 +224,15 @@ loop:
 	cur_trans->start_time = get_seconds();
 	cur_trans->dirty_bg_run = 0;
 
+	memset(&cur_trans->delayed_refs, 0, sizeof(cur_trans->delayed_refs));
+
+	/*
+	 * For now RB_ROOT means set to NULL but this could change in
+	 * the future
+	 */
 	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
#1 lore raw

So, updated patches should mention that in the subject eg:

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

Quoted 5 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.

---

And in this section (ie. after the first ---) put a brief description of the changes.

Quoted 8 lines
 fs/btrfs/transaction.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
fs/btrfs/transaction.c +0 -0
index 8f259b3..0581fb4 100644

fs/btrfs/transaction.c loop: · line 232

Quoted 9 lines
fs/btrfs/transaction.c +6 -0
@@ -224,15 +224,15 @@ loop:
 	cur_trans->start_time = get_seconds();
 	cur_trans->dirty_bg_run = 0;
 
+	memset(&cur_trans->delayed_refs, 0, sizeof(cur_trans->delayed_refs));
+
+	/*
+	 * For now RB_ROOT means set to NULL but this could change in
+	 * the future
+	 */

I don't think such comment necessary, the code is clear enough without it.

fs/btrfs/transaction.c loop: · line 234

Quoted 2 lines
fs/btrfs/transaction.c +0 -0
 	cur_trans->delayed_refs.href_root = RB_ROOT;
 	cur_trans->delayed_refs.dirty_extent_root = RB_ROOT;

.

#2 lore raw
Quoted 5 lines · David Sterba

So, updated patches should mention that in the subject eg:

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

On Mon, Sep 07, 2015 at 04:45:02PM +0300, Alexandru Moise wrote:

Quoted 8 lines
Quoted 5 lines

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

---

And in this section (ie. after the first ---) put a brief description of the changes.

Will do.

Quoted 22 lines
Quoted 9 lines
 fs/btrfs/transaction.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
fs/btrfs/transaction.c +0 -0
index 8f259b3..0581fb4 100644

fs/btrfs/transaction.c loop: · line 232

Quoted 9 lines
fs/btrfs/transaction.c +6 -0
@@ -224,15 +224,15 @@ loop:
 	cur_trans->start_time = get_seconds();
 	cur_trans->dirty_bg_run = 0;
 
+	memset(&cur_trans->delayed_refs, 0, sizeof(cur_trans->delayed_refs));
+
+	/*
+	 * For now RB_ROOT means set to NULL but this could change in
+	 * the future
+	 */

I don't think such comment necessary, the code is clear enough without it.

Quoted 4 lines

fs/btrfs/transaction.c loop: · line 234

Quoted 2 lines
fs/btrfs/transaction.c +0 -0
 	cur_trans->delayed_refs.href_root = RB_ROOT;
 	cur_trans->delayed_refs.dirty_extent_root = RB_ROOT;

.

Alright I can agree to that, thanks.