btrfs: remove the extra_gfp parameter from btrfs_alloc_folio_array()
The function btrfs_alloc_folio_array() is only utilized in btrfs_submit_compressed_read() and no other location, and the only caller is not utilizing the @extra_gfp parameter. Reviewed-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
32e6216512
commit
fea91134c2
3 changed files with 5 additions and 8 deletions
|
@ -609,7 +609,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)
|
||||||
goto out_free_bio;
|
goto out_free_bio;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret2 = btrfs_alloc_folio_array(cb->nr_folios, cb->compressed_folios, 0);
|
ret2 = btrfs_alloc_folio_array(cb->nr_folios, cb->compressed_folios);
|
||||||
if (ret2) {
|
if (ret2) {
|
||||||
ret = BLK_STS_RESOURCE;
|
ret = BLK_STS_RESOURCE;
|
||||||
goto out_free_compressed_pages;
|
goto out_free_compressed_pages;
|
||||||
|
|
|
@ -667,24 +667,22 @@ static void end_bbio_data_read(struct btrfs_bio *bbio)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Populate every free slot in a provided array with folios.
|
* Populate every free slot in a provided array with folios using GFP_NOFS.
|
||||||
*
|
*
|
||||||
* @nr_folios: number of folios to allocate
|
* @nr_folios: number of folios to allocate
|
||||||
* @folio_array: the array to fill with folios; any existing non-NULL entries in
|
* @folio_array: the array to fill with folios; any existing non-NULL entries in
|
||||||
* the array will be skipped
|
* the array will be skipped
|
||||||
* @extra_gfp: the extra GFP flags for the allocation
|
|
||||||
*
|
*
|
||||||
* Return: 0 if all folios were able to be allocated;
|
* Return: 0 if all folios were able to be allocated;
|
||||||
* -ENOMEM otherwise, the partially allocated folios would be freed and
|
* -ENOMEM otherwise, the partially allocated folios would be freed and
|
||||||
* the array slots zeroed
|
* the array slots zeroed
|
||||||
*/
|
*/
|
||||||
int btrfs_alloc_folio_array(unsigned int nr_folios, struct folio **folio_array,
|
int btrfs_alloc_folio_array(unsigned int nr_folios, struct folio **folio_array)
|
||||||
gfp_t extra_gfp)
|
|
||||||
{
|
{
|
||||||
for (int i = 0; i < nr_folios; i++) {
|
for (int i = 0; i < nr_folios; i++) {
|
||||||
if (folio_array[i])
|
if (folio_array[i])
|
||||||
continue;
|
continue;
|
||||||
folio_array[i] = folio_alloc(GFP_NOFS | extra_gfp, 0);
|
folio_array[i] = folio_alloc(GFP_NOFS, 0);
|
||||||
if (!folio_array[i])
|
if (!folio_array[i])
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
|
@ -365,8 +365,7 @@ void btrfs_clear_buffer_dirty(struct btrfs_trans_handle *trans,
|
||||||
|
|
||||||
int btrfs_alloc_page_array(unsigned int nr_pages, struct page **page_array,
|
int btrfs_alloc_page_array(unsigned int nr_pages, struct page **page_array,
|
||||||
gfp_t extra_gfp);
|
gfp_t extra_gfp);
|
||||||
int btrfs_alloc_folio_array(unsigned int nr_folios, struct folio **folio_array,
|
int btrfs_alloc_folio_array(unsigned int nr_folios, struct folio **folio_array);
|
||||||
gfp_t extra_gfp);
|
|
||||||
|
|
||||||
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
|
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
|
||||||
bool find_lock_delalloc_range(struct inode *inode,
|
bool find_lock_delalloc_range(struct inode *inode,
|
||||||
|
|
Loading…
Reference in a new issue