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

Commit 1ddd0d9a authored by Grant Erickson's avatar Grant Erickson Committed by David Woodhouse
Browse files

JFFS2: retry large buffer allocations 



Replace direct call to kmalloc for a potentially large, contiguous
buffer allocation with one to mtd_kmalloc_up_to which helps ensure the
operation can succeed under low-memory, highly- fragmented situations
albeit somewhat more slowly.

Signed-off-by: default avatarGrant Erickson <marathon96@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 3e45cf5e

fs/jffs2/scan.c

+11 −8
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) 
	uint32_t buf_size = 0;

	struct jffs2_summary *s = NULL; /* summary info collected by the scan process */

#ifndef __ECOS

	size_t pointlen;

	size_t pointlen, try_size;



	if (c->mtd->point) {

		ret = c->mtd->point(c->mtd, 0, c->mtd->size, &pointlen,
@@ -113,18 +113,21 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) 
		/* For NAND it's quicker to read a whole eraseblock at a time,

		   apparently */

		if (jffs2_cleanmarker_oob(c))

			buf_size = c->sector_size;

			try_size = c->sector_size;

		else

			buf_size = PAGE_SIZE;

			try_size = PAGE_SIZE;



		/* Respect kmalloc limitations */

		if (buf_size > 128*1024)

			buf_size = 128*1024;

		D1(printk(KERN_DEBUG "Trying to allocate readbuf of %zu "

			"bytes\n", try_size));



		D1(printk(KERN_DEBUG "Allocating readbuf of %d bytes\n", buf_size));

		flashbuf = kmalloc(buf_size, GFP_KERNEL);

		flashbuf = mtd_kmalloc_up_to(c->mtd, &try_size);

		if (!flashbuf)

			return -ENOMEM;



		D1(printk(KERN_DEBUG "Allocated readbuf of %zu bytes\n",

			try_size));



		buf_size = (uint32_t)try_size;

	}



	if (jffs2_sum_active()) {