Commit 647dd2c3 authored by Gao Xiang's avatar Gao Xiang
Browse files

erofs: Revert "erofs: fix kvcalloc() misuse with __GFP_NOFAIL" 

Let's revert commit 12724ba3 ("erofs: fix kvcalloc() misuse with
__GFP_NOFAIL") since kvmalloc() already supports __GFP_NOFAIL in commit
a421ef30 ("mm: allow !GFP_KERNEL allocations for kvmalloc").  So
the original fix was wrong.

Actually there was some issue as [1] discussed, so before that mm fix
is landed, the warn could still happen but applying this commit first
will cause less.

[1] https://lore.kernel.org/r/20230305053035.1911-1-hsiangkao@linux.alibaba.com



Fixes: 12724ba3 ("erofs: fix kvcalloc() misuse with __GFP_NOFAIL")
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20230309053148.9223-1-hsiangkao@linux.alibaba.com


Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent 8f121dfb

fs/erofs/zdata.c

+6 −6
Original line number Diff line number Diff line
@@ -1312,11 +1312,11 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, 


	if (!be->decompressed_pages)

		be->decompressed_pages =

			kcalloc(be->nr_pages, sizeof(struct page *),

			kvcalloc(be->nr_pages, sizeof(struct page *),

				 GFP_KERNEL | __GFP_NOFAIL);

	if (!be->compressed_pages)

		be->compressed_pages =

			kcalloc(pclusterpages, sizeof(struct page *),

			kvcalloc(pclusterpages, sizeof(struct page *),

				 GFP_KERNEL | __GFP_NOFAIL);



	z_erofs_parse_out_bvecs(be);
@@ -1365,7 +1365,7 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, 
	}

	if (be->compressed_pages < be->onstack_pages ||

	    be->compressed_pages >= be->onstack_pages + Z_EROFS_ONSTACK_PAGES)

		kfree(be->compressed_pages);

		kvfree(be->compressed_pages);

	z_erofs_fill_other_copies(be, err);



	for (i = 0; i < be->nr_pages; ++i) {
@@ -1384,7 +1384,7 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, 
	}



	if (be->decompressed_pages != be->onstack_pages)

		kfree(be->decompressed_pages);

		kvfree(be->decompressed_pages);



	pcl->length = 0;

	pcl->partial = true;