leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

f2fs: avoid __GFP_NOFAIL in f2fs_bio_alloc

Browse Source 
__f2fs_bio_alloc() won't fail due to memory pool backend, remove unneeded
__GFP_NOFAIL flag in __f2fs_bio_alloc().

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2020-02-18 18:21:34 +08:00 committed by Jaegeuk Kim
parent 439dfb1062
commit ca9e968a5e
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/f2fs/data.c
View File

@ -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); 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 (noio) {
if (no_fail) {
/* No failure on bio allocation */ /* No failure on bio allocation */
bio = __f2fs_bio_alloc(GFP_NOIO, npages); return __f2fs_bio_alloc(GFP_NOIO, npages);
if (!bio)
bio = __f2fs_bio_alloc(GFP_NOIO | __GFP_NOFAIL, npages);
return bio;
} }
if (time_to_inject(sbi, FAULT_ALLOC_BIO)) { if (time_to_inject(sbi, FAULT_ALLOC_BIO)) {
f2fs_show_injection_info(sbi, FAULT_ALLOC_BIO); f2fs_show_injection_info(sbi, FAULT_ALLOC_BIO);
return NULL; return NULL;

2
fs/f2fs/f2fs.h
View File

@ -3341,7 +3341,7 @@ void f2fs_destroy_checkpoint_caches(void);
*/ */
int __init f2fs_init_bioset(void); int __init f2fs_init_bioset(void);
void f2fs_destroy_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); int f2fs_init_bio_entry_cache(void);
void f2fs_destroy_bio_entry_cache(void); void f2fs_destroy_bio_entry_cache(void);
void f2fs_submit_bio(struct f2fs_sb_info *sbi, void f2fs_submit_bio(struct f2fs_sb_info *sbi,