diff options
author | Joe Perches <joe@perches.com> | 2012-01-31 17:42:08 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-03-26 19:21:58 -0400 |
commit | 045ead345b53c6186303f1413f90154f3137f457 (patch) | |
tree | 0ca2af26919b90f19cb986e0e27f41fc684edcf2 /fs/jffs2 | |
parent | 2c4ae276b13114a2c7ebac31257db391b4bf2b6f (diff) |
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>
Diffstat (limited to 'fs/jffs2')
-rw-r--r-- | fs/jffs2/compr_lzo.c | 1 | ||||
-rw-r--r-- | fs/jffs2/compr_zlib.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/jffs2/compr_lzo.c b/fs/jffs2/compr_lzo.c index af186ee674d8..c553bd6506da 100644 --- a/fs/jffs2/compr_lzo.c +++ b/fs/jffs2/compr_lzo.c | |||
@@ -33,7 +33,6 @@ static int __init alloc_workspace(void) | |||
33 | lzo_compress_buf = vmalloc(lzo1x_worst_compress(PAGE_SIZE)); | 33 | lzo_compress_buf = vmalloc(lzo1x_worst_compress(PAGE_SIZE)); |
34 | 34 | ||
35 | if (!lzo_mem || !lzo_compress_buf) { | 35 | if (!lzo_mem || !lzo_compress_buf) { |
36 | printk(KERN_WARNING "Failed to allocate lzo deflate workspace\n"); | ||
37 | free_workspace(); | 36 | free_workspace(); |
38 | return -ENOMEM; | 37 | return -ENOMEM; |
39 | } | 38 | } |
diff --git a/fs/jffs2/compr_zlib.c b/fs/jffs2/compr_zlib.c index 5a001020c542..4e7a138745ec 100644 --- a/fs/jffs2/compr_zlib.c +++ b/fs/jffs2/compr_zlib.c | |||
@@ -42,14 +42,12 @@ static int __init alloc_workspaces(void) | |||
42 | { | 42 | { |
43 | def_strm.workspace = vmalloc(zlib_deflate_workspacesize(MAX_WBITS, | 43 | def_strm.workspace = vmalloc(zlib_deflate_workspacesize(MAX_WBITS, |
44 | MAX_MEM_LEVEL)); | 44 | MAX_MEM_LEVEL)); |
45 | if (!def_strm.workspace) { | 45 | if (!def_strm.workspace) |
46 | printk(KERN_WARNING "Failed to allocate %d bytes for deflate workspace\n", zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL)); | ||
47 | return -ENOMEM; | 46 | return -ENOMEM; |
48 | } | 47 | |
49 | D1(printk(KERN_DEBUG "Allocated %d bytes for deflate workspace\n", zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL))); | 48 | D1(printk(KERN_DEBUG "Allocated %d bytes for deflate workspace\n", zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL))); |
50 | inf_strm.workspace = vmalloc(zlib_inflate_workspacesize()); | 49 | inf_strm.workspace = vmalloc(zlib_inflate_workspacesize()); |
51 | if (!inf_strm.workspace) { | 50 | if (!inf_strm.workspace) { |
52 | printk(KERN_WARNING "Failed to allocate %d bytes for inflate workspace\n", zlib_inflate_workspacesize()); | ||
53 | vfree(def_strm.workspace); | 51 | vfree(def_strm.workspace); |
54 | return -ENOMEM; | 52 | return -ENOMEM; |
55 | } | 53 | } |