[PATCH] Btrfs-progs: remove incorrect slot decrement

[PATCH] Btrfs-progs: remove incorrect slot decrement

[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.

Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
---
 extent-tree.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extent-tree.c b/extent-tree.c
index 381572d..5b6c7aa 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -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]);
-- 
1.7.9.5

Re: [PATCH] Btrfs-progs: remove incorrect slot decrement

[Josef Bacik]

On Fri, Jul 05, 2013 at 02:35:07PM +0100, Filipe David Borba Manana wrote:
> 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.
> 
> Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
> ---
>  extent-tree.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/extent-tree.c b/extent-tree.c
> index 381572d..5b6c7aa 100644
> --- a/extent-tree.c
> +++ b/extent-tree.c
> @@ -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]);

Reviewed-by: Josef Bacik <jbacik@fusionio.com>

Thanks,

Josef

[PATCH v2] Btrfs-progs: remove incorrect slot decrement

[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.

Reviewed-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
---
 extent-tree.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extent-tree.c b/extent-tree.c
index f597e16..e04160b 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -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]);
-- 
1.7.9.5

Re: [PATCH v2] Btrfs-progs: remove incorrect slot decrement

[David Sterba]

On Fri, Jul 05, 2013 at 09:43:34PM +0100, Filipe David Borba Manana wrote:
> 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

Re: [PATCH v2] Btrfs-progs: remove incorrect slot decrement

[Filipe David Manana]

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

Thanks for letting me know.

On Mon, Jul 8, 2013 at 5:14 PM, David Sterba <dsterba@suse.cz> wrote:
> On Fri, Jul 05, 2013 at 09:43:34PM +0100, Filipe David Borba Manana wrote:
>> 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



-- 
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."