lkml.org 
[lkml]   [2020]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/3] f2fs: avoid __GFP_NOFAIL in f2fs_bio_alloc
On 02/18, Chao Yu wrote:
> __f2fs_bio_alloc() won't fail due to memory pool backend, remove unneeded
> __GFP_NOFAIL flag in __f2fs_bio_alloc().

It it safe for old kernels as well when thinking backports?

>
> Signed-off-by: Chao Yu <yuchao0@huawei.com>
> ---
> fs/f2fs/data.c | 12 ++++--------
> fs/f2fs/f2fs.h | 2 +-
> 2 files changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index baf12318ec64..3a4ece26928c 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -54,17 +54,13 @@ static inline struct bio *__f2fs_bio_alloc(gfp_t gfp_mask,
> return bio_alloc_bioset(gfp_mask, nr_iovecs, &f2fs_bioset);
> }
>
> -struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages, bool no_fail)
> +struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages, bool noio)
> {
> - struct bio *bio;
> -
> - if (no_fail) {
> + if (noio) {
> /* No failure on bio allocation */
> - bio = __f2fs_bio_alloc(GFP_NOIO, npages);
> - if (!bio)
> - bio = __f2fs_bio_alloc(GFP_NOIO | __GFP_NOFAIL, npages);
> - return bio;
> + return __f2fs_bio_alloc(GFP_NOIO, npages);
> }
> +
> if (time_to_inject(sbi, FAULT_ALLOC_BIO)) {
> f2fs_show_injection_info(sbi, FAULT_ALLOC_BIO);
> return NULL;
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 5316ac3eacdf..65f569949d42 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -3343,7 +3343,7 @@ void f2fs_destroy_checkpoint_caches(void);
> */
> int __init f2fs_init_bioset(void);
> void f2fs_destroy_bioset(void);
> -struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages, bool no_fail);
> +struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages, bool noio);
> int f2fs_init_bio_entry_cache(void);
> void f2fs_destroy_bio_entry_cache(void);
> void f2fs_submit_bio(struct f2fs_sb_info *sbi,
> --
> 2.18.0.rc1

\
 
 \ /
  Last update: 2020-02-19 03:50    [W:0.161 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site