Skip to contentSkip to conversation

Btrfs-progs: remove incorrect slot decrement

PATCH Superseded Filipe David Borba Manana 3 participants 5 messages Jul 5, 2013 – Jul 8, 2013 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Btrfs-progs: remove incorrect slot decrement

In btrfs_set_block_flags() we want to check if the slot in the leaf points to the first item in the leaf - if it doesn't check if the previous item in the leaf is an extent item. By removing this extra slot decrement we are indeed checking the item right before the slot, and not the second item before.

---
 extent-tree.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
extent-tree.c +1 -1
index 381572d..5b6c7aa 100644
@@ -1609,7 +1609,7 @@ again:
 
 	if (ret > 0 && skinny_metadata) {
 		skinny_metadata = 0;
-		if (path->slots[0]--) {
+		if (path->slots[0]) {
 			path->slots[0]--;
 			btrfs_item_key_to_cpu(path->nodes[0], &key,
 					      path->slots[0]);
Signature · 1 line
1.7.9.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 17 lines · Filipe David Borba Manana

In btrfs_set_block_flags() we want to check if the slot in the leaf points to the first item in the leaf - if it doesn't check if the previous item in the leaf is an extent item. By removing this extra slot decrement we are indeed checking the item right before the slot, and not the second item before.

---
 extent-tree.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
extent-tree.c +0 -0
index 381572d..5b6c7aa 100644

extent-tree.c again: · line 1615

Quoted 8 lines
extent-tree.c +1 -1
@@ -1609,7 +1609,7 @@ again:
 
 	if (ret > 0 && skinny_metadata) {
 		skinny_metadata = 0;
-		if (path->slots[0]--) {
+		if (path->slots[0]) {
 			path->slots[0]--;
 			btrfs_item_key_to_cpu(path->nodes[0], &key,
 					      path->slots[0]);

Thanks,

Josef

#2 lore raw

PATCH v2 1/1 Btrfs-progs: remove incorrect slot decrement

In btrfs_set_block_flags() we want to check if the slot in the leaf points to the first item in the leaf - if it doesn't check if the previous item in the leaf is an extent item. By removing this extra slot decrement we are indeed checking the item right before the slot, and not the second item before.

V2: Added Josef Bacik's review mention.

---
 extent-tree.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
extent-tree.c +1 -1
index f597e16..e04160b 100644
@@ -1596,7 +1596,7 @@ again:
 
 	if (ret > 0 && skinny_metadata) {
 		skinny_metadata = 0;
-		if (path->slots[0]--) {
+		if (path->slots[0]) {
 			path->slots[0]--;
 			btrfs_item_key_to_cpu(path->nodes[0], &key,
 					      path->slots[0]);
Signature · 1 line
1.7.9.5
#3 lore raw
Quoted 8 lines · Filipe David Borba Manana

In btrfs_set_block_flags() we want to check if the slot in the leaf points to the first item in the leaf - if it doesn't check if the previous item in the leaf is an extent item. By removing this extra slot decrement we are indeed checking the item right before the slot, and not the second item before.

V2: Added Josef Bacik's review mention.

Please don't do that. It's ok to increase version if you update code or changelog/subject, but not just the tags.

thanks,
david

#4 lore raw

Ok, sorry.
I'm not used to git send-email and related best practices.

Thanks for letting me know.

Quoted 15 lines · David Sterba
Quoted 8 lines · Filipe David Borba Manana

In btrfs_set_block_flags() we want to check if the slot in the leaf points to the first item in the leaf - if it doesn't check if the previous item in the leaf is an extent item. By removing this extra slot decrement we are indeed checking the item right before the slot, and not the second item before.

V2: Added Josef Bacik's review mention.

Please don't do that. It's ok to increase version if you update code or changelog/subject, but not just the tags.

thanks,
david

Signature · 5 lines
Filipe David Manana,

"Reasonable men adapt themselves to the world.
 Unreasonable men adapt the world to themselves.
 That's why all progress depends on unreasonable men."