staging: erofs: tidy up zpvec.h (046d64e1) · Commits · 戴 / test

drivers/staging/erofs/zdata.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -314,7 +314,7 @@ static int z_erofs_vle_work_add_page(
		try_to_reuse_as_compressed_page(builder, page))
		return 0;

		ret = z_erofs_pagevec_ctor_enqueue(&builder->vector,
		ret = z_erofs_pagevec_enqueue(&builder->vector,
		page, type, &occupied);
		builder->work->vcnt += (unsigned int)ret;

		@@ -938,7 +938,7 @@ static int z_erofs_vle_unzip(struct super_block *sb,
		for (i = 0; i < work->vcnt; ++i) {
		unsigned int pagenr;

		page = z_erofs_pagevec_ctor_dequeue(&ctor, &page_type);
		page = z_erofs_pagevec_dequeue(&ctor, &page_type);

		/* all pages in pagevec ought to be valid */
		DBG_BUGON(!page);

+9 −16

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@

		#include "tagptr.h"

		/* page type in pagevec for unzip subsystem */
		/* page type in pagevec for decompress subsystem */
		enum z_erofs_page_type {
		/* including Z_EROFS_VLE_PAGE_TAIL_EXCLUSIVE */
		Z_EROFS_PAGE_TYPE_EXCLUSIVE,
		@@ -103,13 +103,11 @@ static inline void z_erofs_pagevec_ctor_init(struct z_erofs_pagevec_ctor *ctor,
		z_erofs_pagevec_ctor_pagedown(ctor, false);
		}
		}

		ctor->next = z_erofs_pagevec_ctor_next_page(ctor, i);
		ctor->index = i;
		}

		static inline bool
		z_erofs_pagevec_ctor_enqueue(struct z_erofs_pagevec_ctor *ctor,
		static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor,
		struct page *page,
		enum z_erofs_page_type type,
		bool *occupied)
		@@ -131,14 +129,12 @@ z_erofs_pagevec_ctor_enqueue(struct z_erofs_pagevec_ctor *ctor,
		ctor->next = page;
		*occupied = true;
		}

		ctor->pages[ctor->index++] =
		tagptr_fold(erofs_vtptr_t, page, type);
		ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type);
		return true;
		}

		static inline struct page *
		z_erofs_pagevec_ctor_dequeue(struct z_erofs_pagevec_ctor *ctor,
		z_erofs_pagevec_dequeue(struct z_erofs_pagevec_ctor *ctor,
		enum z_erofs_page_type *type)
		{
		erofs_vtptr_t t;
		@@ -156,11 +152,8 @@ z_erofs_pagevec_ctor_dequeue(struct z_erofs_pagevec_ctor *ctor,
		if (*type == (uintptr_t)ctor->next)
		ctor->next = tagptr_unfold_ptr(t);

		ctor->pages[ctor->index++] =
		tagptr_fold(erofs_vtptr_t, NULL, 0);

		ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, NULL, 0);
		return tagptr_unfold_ptr(t);
		}

		#endif