Commit ca9e968a authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: avoid __GFP_NOFAIL in f2fs_bio_alloc 



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

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 439dfb10

fs/f2fs/data.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -3341,7 +3341,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,