TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: clarify error returns values in __load_free_space_cache

Browse Source 
[ Upstream commit 3cc64e7ebfb0d7faaba2438334c43466955a96e8 ]

Return value in __load_free_space_cache is not properly set after
(unlikely) memory allocation failures and 0 is returned instead.
This is not a problem for the caller load_free_space_cache because only
value 1 is considered as 'cache loaded' but for clarity it's better
to set the errors accordingly.

Fixes: a67509c300 ("Btrfs: add a io_ctl struct and helpers for dealing with the space cache")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Zhihao Cheng
2020-11-20 09:08:04 +08:00
committed by Greg Kroah-Hartman
parent afd88a7b17
commit 957a92872a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/btrfs/free-space-cache.c
View File

@@ -743,8 +743,10 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
while (num_entries) { while (num_entries) {
e = kmem_cache_zalloc(btrfs_free_space_cachep, e = kmem_cache_zalloc(btrfs_free_space_cachep,
GFP_NOFS); GFP_NOFS);
if (!e) if (!e) {
ret = -ENOMEM;
goto free_cache; goto free_cache;
}
ret = io_ctl_read_entry(&io_ctl, e, &type); ret = io_ctl_read_entry(&io_ctl, e, &type);
if (ret) { if (ret) {
@@ -753,6 +755,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
} }
if (!e->bytes) { if (!e->bytes) {
ret = -1;
kmem_cache_free(btrfs_free_space_cachep, e); kmem_cache_free(btrfs_free_space_cachep, e);
goto free_cache; goto free_cache;
} }
@@ -773,6 +776,7 @@ static int __load_free_space_cache(struct btrfs_root *root, struct inode *inode,
e->bitmap = kmem_cache_zalloc( e->bitmap = kmem_cache_zalloc(
btrfs_free_space_bitmap_cachep, GFP_NOFS); btrfs_free_space_bitmap_cachep, GFP_NOFS);
if (!e->bitmap) { if (!e->bitmap) {
ret = -ENOMEM;
kmem_cache_free( kmem_cache_free(
btrfs_free_space_cachep, e); btrfs_free_space_cachep, e);
goto free_cache; goto free_cache;