zram: fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Wed, 15 Apr 2015 23:16:27 +0000 (16:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Apr 2015 23:35:22 +0000 (16:35 -0700)
Return a negative error code on failure.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Acked-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/block/zram/zram_drv.c

index 4491787095a00f345427b73217a9ee8376dafdf2..c94386aa563d618abf2d59a046b50b1607c3a20f 100644 (file)
@@ -1154,6 +1154,7 @@ static int create_device(struct zram *zram, int device_id)
        if (!zram->disk) {
                pr_warn("Error allocating disk structure for device %d\n",
                        device_id);
+               ret = -ENOMEM;
                goto out_free_queue;
        }