提交 fdf250db 编写于 作者: Q Qu Wenruo 提交者: David Sterba

btrfs: subpage: only call btrfs_alloc_subpage() when sectorsize is smaller than PAGE_SIZE

There are two call sites of btrfs_alloc_subpage():

- btrfs_attach_subpage()
  We have ensured sectorsize is smaller than PAGE_SIZE

- alloc_extent_buffer()
  We call btrfs_alloc_subpage() unconditionally.

The alloc_extent_buffer() forces us to check the sectorsize size against
page size inside btrfs_alloc_subpage().

Since the function name, btrfs_alloc_subpage(), already indicates it
should only get called for subpage cases, do the check in
alloc_extent_buffer() and add an ASSERT() in btrfs_alloc_subpage().
Reviewed-by: NNikolay Borisov <nborisov@suse.com>
Signed-off-by: NQu Wenruo <wqu@suse.com>
Reviewed-by: NDavid Sterba <dsterba@suse.com>
Signed-off-by: NDavid Sterba <dsterba@suse.com>
上级 9675ea8c
...@@ -6137,13 +6137,15 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, ...@@ -6137,13 +6137,15 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
* page, but it may change in the future for 16K page size * page, but it may change in the future for 16K page size
* support, so we still preallocate the memory in the loop. * support, so we still preallocate the memory in the loop.
*/ */
ret = btrfs_alloc_subpage(fs_info, &prealloc, if (fs_info->sectorsize < PAGE_SIZE) {
BTRFS_SUBPAGE_METADATA); ret = btrfs_alloc_subpage(fs_info, &prealloc,
if (ret < 0) { BTRFS_SUBPAGE_METADATA);
unlock_page(p); if (ret < 0) {
put_page(p); unlock_page(p);
exists = ERR_PTR(ret); put_page(p);
goto free_eb; exists = ERR_PTR(ret);
goto free_eb;
}
} }
spin_lock(&mapping->private_lock); spin_lock(&mapping->private_lock);
......
...@@ -104,8 +104,7 @@ int btrfs_alloc_subpage(const struct btrfs_fs_info *fs_info, ...@@ -104,8 +104,7 @@ int btrfs_alloc_subpage(const struct btrfs_fs_info *fs_info,
struct btrfs_subpage **ret, struct btrfs_subpage **ret,
enum btrfs_subpage_type type) enum btrfs_subpage_type type)
{ {
if (fs_info->sectorsize == PAGE_SIZE) ASSERT(fs_info->sectorsize < PAGE_SIZE);
return 0;
*ret = kzalloc(sizeof(struct btrfs_subpage), GFP_NOFS); *ret = kzalloc(sizeof(struct btrfs_subpage), GFP_NOFS);
if (!*ret) if (!*ret)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册