Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 480a1a6a authored by Hyunchul Lee's avatar Hyunchul Lee Committed by Richard Weinberger
Browse files

ubifs: Change gfp flags in page allocation for bulk read 



In low memory situations, page allocations for bulk read
can kill applications for reclaiming memory, and print an
failure message when allocations are failed.
Because bulk read is just an optimization, we don't have
to do these and can stop page allocations.

Though this siutation happens rarely, add __GFP_NORETRY
to prevent from excessive memory reclaim and killing
applications, and __GFP_WARN to suppress this failure
message.

For this, Use readahead_gfp_mask for gfp flags when
allocating pages.

Signed-off-by: default avatarHyunchul Lee <cheol.lee@lge.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 07d41c3c

fs/ubifs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -735,6 +735,7 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct bu_info *bu, 
	int err, page_idx, page_cnt, ret = 0, n = 0;

	int allocate = bu->buf ? 0 : 1;

	loff_t isize;

	gfp_t ra_gfp_mask = readahead_gfp_mask(mapping) & ~__GFP_FS;



	err = ubifs_tnc_get_bu_keys(c, bu);

	if (err)
@@ -796,8 +797,7 @@ static int ubifs_do_bulk_read(struct ubifs_info *c, struct bu_info *bu, 


		if (page_offset > end_index)

			break;

		page = find_or_create_page(mapping, page_offset,

					   GFP_NOFS | __GFP_COLD);

		page = find_or_create_page(mapping, page_offset, ra_gfp_mask);

		if (!page)

			break;

		if (!PageUptodate(page))