Commit f24ee92c authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Andrew Morton
Browse files

zram: use IS_ERR_VALUE() to check for zs_malloc() errors 

Avoid typecasts that are needed for IS_ERR() and use IS_ERR_VALUE()
instead.

Link: https://lkml.kernel.org/r/20221109115047.2921851-8-senozhatsky@chromium.org


Suggested-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Alexey Romanov <avromanov@sberdevices.ru>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Suleiman Souhlal <suleiman@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9fda785d

drivers/block/zram/zram_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -1542,19 +1542,19 @@ static int __zram_bvec_write(struct zram *zram, struct bio_vec *bvec, 
	 * if we have a 'non-null' handle here then we are coming

	 * from the slow path and handle has already been allocated.

	 */

	if (IS_ERR((void *)handle))

	if (IS_ERR_VALUE(handle))

		handle = zs_malloc(zram->mem_pool, comp_len,

				__GFP_KSWAPD_RECLAIM |

				__GFP_NOWARN |

				__GFP_HIGHMEM |

				__GFP_MOVABLE);

	if (IS_ERR((void *)handle)) {

	if (IS_ERR_VALUE(handle)) {

		zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]);

		atomic64_inc(&zram->stats.writestall);

		handle = zs_malloc(zram->mem_pool, comp_len,

				GFP_NOIO | __GFP_HIGHMEM |

				__GFP_MOVABLE);

		if (IS_ERR((void *)handle))

		if (IS_ERR_VALUE(handle))

			return PTR_ERR((void *)handle);



		if (comp_len != PAGE_SIZE)