Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8fdcc15c authored by Dan Carpenter's avatar Dan Carpenter Committed by Michael Bestas
Browse files

UPSTREAM: erofs: fix an error code in z_erofs_init_zip_subsystem() 



Return -ENOMEM if alloc_workqueue() fails.  Don't return success.

Fixes: d8a650adf429 ("erofs: add per-cpu threads for decompression as an option")
Bug: 271636421
Bug: 278520205
Tests: launch_cvd
Change-Id: I49dcf8094655db47ac71ae8967b5402373fc7adc
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Reviewed-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/Y+4d0FRsUq8jPoOu@kili


Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
(cherry picked from commit 8d1b80a79452630f157bf634ae9cfcd9f4eed161)
Signed-off-by: default avatarSandeep Dhavale <dhavale@google.com>
(cherry picked from commit 5004cc655730355d681b333ff5eafd62a4ee02f2)
(cherry picked from commit b7f5039f59d8bee886f584c65ca30f14be4b642c)
parent 5b68ef13

fs/erofs/zdata.c

+3 −1
Original line number Diff line number Diff line
@@ -257,8 +257,10 @@ int __init z_erofs_init_zip_subsystem(void) 


	z_erofs_workqueue = alloc_workqueue("erofs_worker",

			WQ_UNBOUND | WQ_HIGHPRI, num_possible_cpus());

	if (!z_erofs_workqueue)

	if (!z_erofs_workqueue) {

		err = -ENOMEM;

		goto out_error_workqueue_init;

	}



	err = erofs_init_percpu_workers();

	if (err)