jffs2: Remove unnecessary OOM messages
authorJoe Perches <joe@perches.com>
Tue, 31 Jan 2012 22:42:08 +0000 (14:42 -0800)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 26 Mar 2012 23:21:58 +0000 (00:21 +0100)
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>
fs/jffs2/compr_lzo.c
fs/jffs2/compr_zlib.c

index af186ee674d8f79ddda691a86e59af88fa29bd24..c553bd6506da228086da2939832d3b63fb770463 100644 (file)
@@ -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;
        }
index 5a001020c542a652726e18521429d2d44b6c31d5..4e7a138745ec5d06a1d77ffbc79f76d7e3d51b2d 100644 (file)
@@ -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;
        }