The patch titled Subject: zram-rework-reset-and-destroy-path-fix-3 has been removed from the -mm tree. Its filename was zram-rework-reset-and-destroy-path-fix-3.patch This patch was dropped because it was folded into zram-rework-reset-and-destroy-path.patch ------------------------------------------------------ From: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx> Subject: zram-rework-reset-and-destroy-path-fix-3 simplifications Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/zram/zram_drv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff -puN drivers/block/zram/zram_drv.c~zram-rework-reset-and-destroy-path-fix-3 drivers/block/zram/zram_drv.c --- a/drivers/block/zram/zram_drv.c~zram-rework-reset-and-destroy-path-fix-3 +++ a/drivers/block/zram/zram_drv.c @@ -1141,7 +1141,7 @@ static void destroy_devices(unsigned int 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", @@ -1157,8 +1157,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); _ Patches currently in -mm which might be from sergey.senozhatsky.work@xxxxxxxxx are zram-rework-reset-and-destroy-path.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html