Subject: [folded-merged] zram-return-error-valued-pointer-from-zcomp_create-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,jmarchan@xxxxxxxxxx,minchan@xxxxxxxxxx,ngupta@xxxxxxxxxx,sergey.senozhatsky@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 07 Apr 2014 15:14:20 -0700 The patch titled Subject: zram-return-error-valued-pointer-from-zcomp_create-fix has been removed from the -mm tree. Its filename was zram-return-error-valued-pointer-from-zcomp_create-fix.patch This patch was dropped because it was folded into zram-return-error-valued-pointer-from-zcomp_create.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: zram-return-error-valued-pointer-from-zcomp_create-fix clean up error recovery flow Cc: Jerome Marchand <jmarchan@xxxxxxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Cc: Nitin Gupta <ngupta@xxxxxxxxxx> Acked-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/zram/zram_drv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff -puN drivers/block/zram/zram_drv.c~zram-return-error-valued-pointer-from-zcomp_create-fix drivers/block/zram/zram_drv.c --- a/drivers/block/zram/zram_drv.c~zram-return-error-valued-pointer-from-zcomp_create-fix +++ a/drivers/block/zram/zram_drv.c @@ -583,7 +583,7 @@ static ssize_t disksize_store(struct dev struct zcomp *comp; struct zram_meta *meta; struct zram *zram = dev_to_zram(dev); - int err = -EBUSY; + int err; disksize = memparse(buf, NULL); if (!disksize) @@ -599,14 +599,14 @@ static ssize_t disksize_store(struct dev pr_info("Cannot initialise %s compressing backend\n", zram->compressor); err = PTR_ERR(comp); - goto out_cleanup; + goto out_free_meta; } down_write(&zram->init_lock); if (init_done(zram)) { - up_write(&zram->init_lock); pr_info("Cannot change disksize for initialized device\n"); - goto out_cleanup; + err = -EBUSY; + goto out_destroy_comp; } zram->meta = meta; @@ -614,12 +614,12 @@ static ssize_t disksize_store(struct dev zram->disksize = disksize; set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT); up_write(&zram->init_lock); - return len; -out_cleanup: - if (!IS_ERR(comp)) - zcomp_destroy(comp); +out_destroy_comp: + up_write(&zram->init_lock); + zcomp_destroy(comp); +out_free_meta: zram_meta_free(meta); return err; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mmnuma-reorganize-change_pmd_range.patch drivers-lguest-page_tablesc-rename-do_set_pte.patch mm-add-debugfs-tunable-for-fault_around_order.patch mm-per-thread-vma-caching.patch mm-use-macros-from-compilerh-instead-of-__attribute__.patch mm-vmallocc-enhance-vm_map_ram-comment.patch mm-readaheadc-inline-ra_submit.patch zram-use-zcomp-compressing-backends.patch zram-return-error-valued-pointer-from-zcomp_create.patch zram-return-error-valued-pointer-from-zcomp_create-fix-2.patch zram-propagate-error-to-user-fix.patch zram-support-req_discard-v4-fix.patch include-linux-crash_dumph-add-vmcore_cleanup-prototype-fix.patch kernel-panicc-display-reason-at-end-pr_emerg-fix.patch fault-injection-set-bounds-on-what-proc-self-make-it-fail-accepts-fix.patch initramfs-debug-detected-compression-method-fix.patch slub-use-raw_cpu_inc-for-incrementing-statistics-fix.patch vmstat-use-raw_cpu_ops-to-avoid-false-positives-on-preemption-checks-fix.patch percpu-add-preemption-checks-to-__this_cpu-ops-fix-checkpatch-fixes.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