From: Sergey Senozhatsky <senozhatsky@chromium.org>
To: Andrew Morton <akpm@linux-foundation.org>,
Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Sergey Senozhatsky <senozhatsky@chromium.org>
Subject: [PATCHv4 9/9] zram: Use IS_ERR_VALUE() to check for zs_malloc() errors
Date: Tue, 18 Oct 2022 13:55:33 +0900 [thread overview]
Message-ID: <20221018045533.2396670-10-senozhatsky@chromium.org> (raw)
In-Reply-To: <20221018045533.2396670-1-senozhatsky@chromium.org>
Avoid type casts that are needed for IS_ERR() and use
IS_ERR_VALUE() instead.
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
drivers/block/zram/zram_drv.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 6b56f6f2ce82..422e3cfd2ddc 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1506,19 +1506,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_ZCOMP]);
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)
@@ -1685,7 +1685,7 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page,
__GFP_NOWARN |
__GFP_HIGHMEM |
__GFP_MOVABLE);
- if (IS_ERR((void *)handle_next)) {
+ if (IS_ERR_VALUE(handle_next)) {
zcomp_stream_put(zram->comps[ZRAM_SECONDARY_ZCOMP]);
return PTR_ERR((void *)handle_next);
}
--
2.38.0.413.g74048e4d9e-goog
next prev parent reply other threads:[~2022-10-18 4:56 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 4:55 [PATCHv4 0/9] zram: Support multiple compression streams Sergey Senozhatsky
2022-10-18 4:55 ` [PATCHv4 1/9] zram: Preparation for multi-zcomp support Sergey Senozhatsky
2022-11-02 20:13 ` Minchan Kim
2022-11-03 2:40 ` Sergey Senozhatsky
2022-10-18 4:55 ` [PATCHv4 2/9] zram: Add recompression algorithm sysfs knob Sergey Senozhatsky
2022-11-02 20:15 ` Minchan Kim
2022-11-03 3:05 ` Sergey Senozhatsky
2022-11-03 3:54 ` Sergey Senozhatsky
2022-11-03 17:10 ` Minchan Kim
2022-11-03 4:09 ` Sergey Senozhatsky
2022-11-03 5:36 ` Sergey Senozhatsky
2022-11-03 17:11 ` Minchan Kim
2022-11-03 16:34 ` Minchan Kim
2022-11-04 3:18 ` Sergey Senozhatsky
2022-11-04 4:53 ` Sergey Senozhatsky
2022-11-04 17:43 ` Minchan Kim
2022-11-04 23:41 ` Sergey Senozhatsky
2022-11-05 0:00 ` Sergey Senozhatsky
2022-11-07 19:08 ` Minchan Kim
2022-11-08 0:40 ` Sergey Senozhatsky
2022-11-05 0:01 ` Minchan Kim
2022-11-05 1:30 ` Sergey Senozhatsky
2022-11-04 16:34 ` Minchan Kim
2022-11-04 23:25 ` Sergey Senozhatsky
2022-11-04 23:40 ` Minchan Kim
2022-11-04 23:44 ` Sergey Senozhatsky
2022-11-05 0:02 ` Minchan Kim
2022-10-18 4:55 ` [PATCHv4 3/9] zram: Factor out WB and non-WB zram read functions Sergey Senozhatsky
2022-11-02 20:20 ` Minchan Kim
2022-11-03 2:43 ` Sergey Senozhatsky
2022-10-18 4:55 ` [PATCHv4 4/9] zram: Introduce recompress sysfs knob Sergey Senozhatsky
2022-11-02 21:06 ` Minchan Kim
2022-11-03 3:25 ` Sergey Senozhatsky
2022-11-03 6:03 ` Sergey Senozhatsky
2022-11-03 17:00 ` Minchan Kim
2022-11-04 3:48 ` Sergey Senozhatsky
2022-11-04 7:12 ` Sergey Senozhatsky
2022-11-04 17:53 ` Minchan Kim
2022-11-04 17:27 ` Minchan Kim
2022-11-04 23:22 ` Sergey Senozhatsky
2022-11-04 7:53 ` Sergey Senozhatsky
2022-11-04 8:08 ` Sergey Senozhatsky
2022-11-04 17:47 ` Minchan Kim
2022-10-18 4:55 ` [PATCHv4 5/9] documentation: Add recompression documentation Sergey Senozhatsky
2022-10-18 4:55 ` [PATCHv4 6/9] zram: Add recompression algorithm choice to Kconfig Sergey Senozhatsky
2022-10-18 4:55 ` [PATCHv4 7/9] zram: Add recompress flag to read_block_state() Sergey Senozhatsky
2022-10-18 4:55 ` [PATCHv4 8/9] zram: Clarify writeback_store() comment Sergey Senozhatsky
2022-10-18 4:55 ` Sergey Senozhatsky [this message]
2022-11-02 20:07 ` [PATCHv4 0/9] zram: Support multiple compression streams Minchan Kim
2022-11-03 3:36 ` Sergey Senozhatsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221018045533.2396670-10-senozhatsky@chromium.org \
--to=senozhatsky@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=ngupta@vflare.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).