On 29.03.19 г. 13:02 ч., Qu Wenruo wrote:
> [snip]
>>> +/*
>>> + * For free space inodes, we can't call check_inode_item() as free space
>>> + * cache inode doesn't have INODE_REF.
>>> + * We just check its inode mode.
>>> + */
>>> +int check_repair_free_space_inode(struct btrfs_fs_info *fs_info,
>>> +                             struct btrfs_path *path)
>>> +{
>>> +   struct btrfs_inode_item *iitem;
>>> +   struct btrfs_key key;
>>> +   u32 mode;
>>> +   int ret = 0;
>>> +
>>> +   btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
>>> +   ASSERT(key.type == BTRFS_INODE_ITEM_KEY && is_fstree(key.objectid));
>>> +   iitem = btrfs_item_ptr(path->nodes[0], path->slots[0],
>>> +                          struct btrfs_inode_item);
>>> +   mode = btrfs_inode_mode(path->nodes[0], iitem);
>>> +   if (mode != FREE_SPACE_CACHE_INODE_MODE) {
>>> +           error(
>>> +   "free space cache inode %llu has invalid mode: has 0%o expect 0%o",
>>> +                   key.objectid, mode, FREE_SPACE_CACHE_INODE_MODE);
>>> +           ret = -EUCLEAN;
>>> +           if (repair) {
>>> +                   ret = repair_imode_lowmem(fs_info->tree_root,
>>> +                                             path);
>>> +                   if (ret < 0)
>>> +                           return ret;
>>> +                   return ret;
>>> +           }
>>> +   }
>>> +   return ret;
>>> +}
>>
>> You put this function in mode-lowmem, yet it's also used in the next
>> patch to implement check/repair for original mode. Since you are oging
>> to re-use function across the 2 modes it makes no sense to separate them
>> in their names. Perhaps put them in mode-common.c
>>
> 
> The limitation is due to repair_imode_lowmem().

move it to the common file as well ?

> 
> Thanks,
> Qu
> 
>>> +
>>>  /*
>>>   * Check all fs/file tree in low_memory mode.
>>>   *
>>> @@ -5130,6 +5164,17 @@ int check_fs_roots_lowmem(struct btrfs_fs_info 
>>> *fs_info)
>>>             btrfs_item_key_to_cpu(node, &key, slot);
>>>             if (key.objectid > BTRFS_LAST_FREE_OBJECTID)
>>>                     goto out;
>>> +           if (key.type == BTRFS_INODE_ITEM_KEY &&
>>> +               is_fstree(key.objectid)) {
>>> +                   ret = check_repair_free_space_inode(fs_info, &path);
>>> +                   /* Check if we still have a valid path to continue */
>>> +                   if (ret < 0 && path.nodes[0]) {
>>> +                           err |= ret;
>>> +                           goto next;
>>> +                   }
>>> +                   if (ret < 0 && !path.nodes[0])
>>> +                           goto out;
>>> +           }
>>>             if (key.type == BTRFS_ROOT_ITEM_KEY &&
>>>                 fs_root_objectid(key.objectid)) {
>>>                     if (key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
>>> diff --git a/check/mode-lowmem.h b/check/mode-lowmem.h
>>> index e0ab30b770d5..d2983fd12eb4 100644
>>> --- a/check/mode-lowmem.h
>>> +++ b/check/mode-lowmem.h
>>> @@ -67,5 +67,7 @@
>>>  
>>>  int check_fs_roots_lowmem(struct btrfs_fs_info *fs_info);
>>>  int check_chunks_and_extents_lowmem(struct btrfs_fs_info *fs_info);
>>> +int check_repair_free_space_inode(struct btrfs_fs_info *fs_info,
>>> +                             struct btrfs_path *path);
>>>  
>>>  #endif
>>>

Reply via email to