]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
zram: remove zcomp_stream_put() from write_incompressible_page()
authorSergey Senozhatsky <senozhatsky@chromium.org>
Wed, 15 Jan 2025 07:19:16 +0000 (16:19 +0900)
committerAndrew Morton <akpm@linux-foundation.org>
Sun, 26 Jan 2025 04:22:45 +0000 (20:22 -0800)
We cannot and should not put per-CPU compression stream in
write_incompressible_page() because that function never gets any
per-CPU streams in the first place.  It's zram_write_page() that
puts the stream before it calls write_incompressible_page().

Link: https://lkml.kernel.org/r/20250115072003.380567-1-senozhatsky@chromium.org
Fixes: 485d11509d6d ("zram: factor out ZRAM_HUGE write")
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/block/zram/zram_drv.c

index 70ecaee25c20a63ba7d02495894116e545c82ab0..9f5020b077c5bf51a878dd3be4d9c6bb3f363ae9 100644 (file)
@@ -1683,7 +1683,6 @@ static int write_incompressible_page(struct zram *zram, struct page *page,
                return PTR_ERR((void *)handle);
 
        if (!zram_can_store_page(zram)) {
-               zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]);
                zs_free(zram->mem_pool, handle);
                return -ENOMEM;
        }