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

Commit 045ead34 authored Jan 31, 2012 by Joe Perches Committed by David Woodhouse Mar 27, 2012

jffs2: Remove unnecessary OOM messages



Per call site OOM messages are unnecessary.
k.alloc and v.alloc failures use dump_stack().

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

parent 2c4ae276

fs/jffs2/compr_lzo.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ static int __init alloc_workspace(void)
		lzo_compress_buf = vmalloc(lzo1x_worst_compress(PAGE_SIZE));

		if (!lzo_mem \|\| !lzo_compress_buf) {
		printk(KERN_WARNING "Failed to allocate lzo deflate workspace\n");
		free_workspace();
		return -ENOMEM;
		}

fs/jffs2/compr_zlib.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -42,14 +42,12 @@ static int __init alloc_workspaces(void)
		{
		def_strm.workspace = vmalloc(zlib_deflate_workspacesize(MAX_WBITS,
		MAX_MEM_LEVEL));
		if (!def_strm.workspace) {
		printk(KERN_WARNING "Failed to allocate %d bytes for deflate workspace\n", zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL));
		if (!def_strm.workspace)
		return -ENOMEM;
		}

		D1(printk(KERN_DEBUG "Allocated %d bytes for deflate workspace\n", zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL)));
		inf_strm.workspace = vmalloc(zlib_inflate_workspacesize());
		if (!inf_strm.workspace) {
		printk(KERN_WARNING "Failed to allocate %d bytes for inflate workspace\n", zlib_inflate_workspacesize());
		vfree(def_strm.workspace);
		return -ENOMEM;
		}