The patch titled Subject: zram-implement-rw_page-operation-of-zram-fix-2-cleanup has been removed from the -mm tree. Its filename was zram-implement-rw_page-operation-of-zram-fix-2-cleanup.patch This patch was dropped because it was folded into zram-implement-rw_page-operation-of-zram.patch ------------------------------------------------------ From: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx> Subject: zram-implement-rw_page-operation-of-zram-fix-2-cleanup code cleanup Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Cc: Karam Lee <karam.lee@xxxxxxx> Cc: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx> Cc: Jerome Marchand <jmarchan@xxxxxxxxxx> Cc: Nitin Gupta <ngupta@xxxxxxxxxx> Cc: <seungho1.park@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/zram/zram_drv.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff -puN drivers/block/zram/zram_drv.c~zram-implement-rw_page-operation-of-zram-fix-2-cleanup drivers/block/zram/zram_drv.c --- a/drivers/block/zram/zram_drv.c~zram-implement-rw_page-operation-of-zram-fix-2-cleanup +++ a/drivers/block/zram/zram_drv.c @@ -956,8 +956,7 @@ static int zram_rw_page(struct block_dev zram = bdev->bd_disk->private_data; if (!valid_io_request(zram, sector, PAGE_SIZE)) { atomic64_inc(&zram->stats.invalid_io); - err = -EINVAL; - goto out; + return -EINVAL; } down_read(&zram->init_lock); @@ -974,15 +973,11 @@ static int zram_rw_page(struct block_dev bv.bv_offset = 0; err = zram_bvec_rw(zram, &bv, index, offset, rw); - out_unlock: up_read(&zram->init_lock); -out: - if (unlikely(err)) - return err; - - page_endio(page, rw, 0); - return 0; + if (err == 0) + page_endio(page, rw, 0); + return err; } static const struct block_device_operations zram_devops = { _ Patches currently in -mm which might be from sergey.senozhatsky@xxxxxxxxx are zsmalloc-merge-size_class-to-reduce-fragmentation.patch zram-implement-rw_page-operation-of-zram.patch zram-implement-rw_page-operation-of-zram-fix-3.patch zsmalloc-fix-zs_init-cpu-notifier-error-handling.patch zsmalloc-fix-zs_init-cpu-notifier-error-handling-fix-2.patch zsmalloc-fix-zs_init-cpu-notifier-error-handling-fix.patch zsmalloc-correct-fragile-_atomic-use.patch mm-zram-correct-zram_zero-flag-bit-position.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