Skip to contentSkip to conversation

btrfs-progs: set transid in btrfs_insert_dir_item

PATCH In review Mark Harmstone 4 participants 4 messages Jul 22, 2024 – Jul 29, 2024 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 btrfs-progs: set transid in btrfs_insert_dir_item

btrfs_insert_dir_item wasn't setting the transid field in btrfs_dir_item. Set it to the current transaction ID rather than writing uninitialized memory to disk.

---
 kernel-shared/dir-item.c | 3 +++
 1 file changed, 3 insertions(+)
kernel-shared/dir-item.c +3 -0
index 4c62597b..5e7d09e6 100644
@@ -27,6 +27,7 @@
 #include "kernel-shared/accessors.h"
 #include "kernel-shared/extent_io.h"
 #include "kernel-shared/uapi/btrfs_tree.h"
+#include "kernel-shared/transaction.h"
 
 struct btrfs_trans_handle;
 
@@ -173,6 +174,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
 	btrfs_set_dir_flags(leaf, dir_item, type);
 	btrfs_set_dir_data_len(leaf, dir_item, 0);
 	btrfs_set_dir_name_len(leaf, dir_item, name_len);
+	btrfs_set_dir_transid(leaf, dir_item, trans->transid);
 	name_ptr = (unsigned long)(dir_item + 1);
 
 	write_extent_buffer(leaf, name, name_ptr, name_len);
@@ -202,6 +204,7 @@ insert:
 	btrfs_set_dir_flags(leaf, dir_item, type);
 	btrfs_set_dir_data_len(leaf, dir_item, 0);
 	btrfs_set_dir_name_len(leaf, dir_item, name_len);
+	btrfs_set_dir_transid(leaf, dir_item, trans->transid);
 	name_ptr = (unsigned long)(dir_item + 1);
 	write_extent_buffer(leaf, name, name_ptr, name_len);
 	btrfs_mark_buffer_dirty(leaf);
Signature · 1 line
2.44.2
Reviewed-by on v2 1/1
#2 lore raw
In reply to Mark Harmstone
Quoted 5 lines · Mark Harmstone

btrfs_insert_dir_item wasn't setting the transid field in btrfs_dir_item. Set it to the current transaction ID rather than writing uninitialized memory to disk.

Thanks,
Qu

Quoted 32 lines
---
  kernel-shared/dir-item.c | 3 +++
  1 file changed, 3 insertions(+)
kernel-shared/dir-item.c +3 -0
index 4c62597b..5e7d09e6 100644
@@ -27,6 +27,7 @@
  #include "kernel-shared/accessors.h"
  #include "kernel-shared/extent_io.h"
  #include "kernel-shared/uapi/btrfs_tree.h"
+#include "kernel-shared/transaction.h"
 
  struct btrfs_trans_handle;
 
@@ -173,6 +174,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
  	btrfs_set_dir_flags(leaf, dir_item, type);
  	btrfs_set_dir_data_len(leaf, dir_item, 0);
  	btrfs_set_dir_name_len(leaf, dir_item, name_len);
+	btrfs_set_dir_transid(leaf, dir_item, trans->transid);
  	name_ptr = (unsigned long)(dir_item + 1);
 
  	write_extent_buffer(leaf, name, name_ptr, name_len);
@@ -202,6 +204,7 @@ insert:
  	btrfs_set_dir_flags(leaf, dir_item, type);
  	btrfs_set_dir_data_len(leaf, dir_item, 0);
  	btrfs_set_dir_name_len(leaf, dir_item, name_len);
+	btrfs_set_dir_transid(leaf, dir_item, trans->transid);
  	name_ptr = (unsigned long)(dir_item + 1);
  	write_extent_buffer(leaf, name, name_ptr, name_len);
  	btrfs_mark_buffer_dirty(leaf);