Re: [PATCH] Btrfs: fix qgroup rescan to work with skinny metadata

[Josef Bacik <jbacik@fb.com>]

On 01/23/2014 06:42 PM, Filipe David Manana wrote:
> On Thu, Jan 23, 2014 at 9:45 PM, Josef Bacik <jbacik@fb.com> wrote:
>> Could have sworn I fixed this before but apparently not.  This makes us pass
>> btrfs/022 with skinny metadata enabled.  Thanks,
>>
>> Signed-off-by: Josef Bacik <jbacik@fb.com>
>> ---
>>   fs/btrfs/qgroup.c | 18 +++++++++++++-----
>>   1 file changed, 13 insertions(+), 5 deletions(-)
>>
>> diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
>> index d22e0a1..7d04026 100644
>> --- a/fs/btrfs/qgroup.c
>> +++ b/fs/btrfs/qgroup.c
>> @@ -1897,9 +1897,17 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
>>          mutex_unlock(&fs_info->qgroup_rescan_lock);
>>
>>          for (; slot < btrfs_header_nritems(scratch_leaf); ++slot) {
>> +               u64 num_bytes;
>> +
>>                  btrfs_item_key_to_cpu(scratch_leaf, &found, slot);
>> -               if (found.type != BTRFS_EXTENT_ITEM_KEY)
>> +               if (found.type != BTRFS_EXTENT_ITEM_KEY ||
>> +                   found.type != BTRFS_METADATA_ITEM_KEY)
>>                          continue;
> Hi Josef,
>
> Shouldn't it be && instead of || ?
>
Yes it should, thanks,

Josef