From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756574AbbBEA6E (ORCPT ); Wed, 4 Feb 2015 19:58:04 -0500 Received: from mail-pd0-f181.google.com ([209.85.192.181]:38935 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756049AbbBEA6C (ORCPT ); Wed, 4 Feb 2015 19:58:02 -0500 Date: Thu, 5 Feb 2015 09:58:01 +0900 From: Sergey Senozhatsky To: akpm@linux-foundation.org Cc: jmarchan@redhat.com, minchan@kernel.org, ngupta@vflare.org, opensource.ganesh@gmail.com, sergey.senozhatsky@gmail.com, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [withdrawn] zram-rework-reset-and-destroy-path-fix-2-fix.patch removed from -mm tree Message-ID: <20150205005801.GB462@swordfish> References: <54d2b870.FAoima8V46EH7lPc%akpm@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <54d2b870.FAoima8V46EH7lPc%akpm@linux-foundation.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On (02/04/15 16:25), akpm@linux-foundation.org wrote: > The patch titled > Subject: zram-rework-reset-and-destroy-path-fix-2-fix > > This patch was dropped because it was withdrawn > simplifications Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 0ed8881..07964dd 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1143,7 +1143,7 @@ static void destroy_devices(unsigned int nr) static int __init zram_init(void) { - int ret = -ENOMEM, dev_id = 0; + int ret, dev_id; if (num_devices > max_num_devices) { pr_warn("Invalid value for num_devices: %u\n", @@ -1159,8 +1159,10 @@ static int __init zram_init(void) /* Allocate the device array and initialize each one */ zram_devices = kzalloc(num_devices * sizeof(struct zram), GFP_KERNEL); - if (!zram_devices) - goto out_error; + if (!zram_devices) { + unregister_blkdev(zram_major, "zram"); + return -ENOMEM; + } for (dev_id = 0; dev_id < num_devices; dev_id++) { ret = create_device(&zram_devices[dev_id], dev_id);