On Thu 29-08-24 15:06:40, Michal Hocko wrote:
> From: Michal Hocko <mhocko@xxxxxxxx>
>
> There is only one called of alloc_page_buffers and it doesn't require
> __GFP_NOFAIL so drop this allocation mode.
>
> Signed-off-by: Michal Hocko <mhocko@xxxxxxxx>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Although even better fix would be to convert the last remaining caller of
alloc_page_buffers() to folio_alloc_buffers()... But that may be more
difficult.
Honza
> ---
> drivers/md/md-bitmap.c | 2 +-
> fs/buffer.c | 5 +----
> include/linux/buffer_head.h | 3 +--
> 3 files changed, 3 insertions(+), 7 deletions(-)
>
> while looking at GFP_NOFAIL users I have encountered this left over.
>
> diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
> index 08232d8dc815..db5330d97348 100644
> --- a/drivers/md/md-bitmap.c
> +++ b/drivers/md/md-bitmap.c
> @@ -360,7 +360,7 @@ static int read_file_page(struct file *file, unsigned long index,
> pr_debug("read bitmap file (%dB @ %llu)\n", (int)PAGE_SIZE,
> (unsigned long long)index << PAGE_SHIFT);
>
> - bh = alloc_page_buffers(page, blocksize, false);
> + bh = alloc_page_buffers(page, blocksize);
> if (!bh) {
> ret = -ENOMEM;
> goto out;
> diff --git a/fs/buffer.c b/fs/buffer.c
> index e55ad471c530..f1381686d325 100644
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@ -958,12 +958,9 @@ struct buffer_head *folio_alloc_buffers(struct folio *folio, unsigned long size,
> }
> EXPORT_SYMBOL_GPL(folio_alloc_buffers);
>
> -struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size,
> - bool retry)
> +struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size)
> {
> gfp_t gfp = GFP_NOFS | __GFP_ACCOUNT;
> - if (retry)
> - gfp |= __GFP_NOFAIL;
>
> return folio_alloc_buffers(page_folio(page), size, gfp);
> }
> diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
> index 14acf1bbe0ce..7e903457967a 100644
> --- a/include/linux/buffer_head.h
> +++ b/include/linux/buffer_head.h
> @@ -199,8 +199,7 @@ void folio_set_bh(struct buffer_head *bh, struct folio *folio,
> unsigned long offset);
> struct buffer_head *folio_alloc_buffers(struct folio *folio, unsigned long size,
> gfp_t gfp);
> -struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size,
> - bool retry);
> +struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size);
> struct buffer_head *create_empty_buffers(struct folio *folio,
> unsigned long blocksize, unsigned long b_state);
> void end_buffer_read_sync(struct buffer_head *bh, int uptodate);
> --
> 2.46.0
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
