erofs: fold in postsubmit_is_all_bypassed() (587a67b7) · Commits · 戴 / test

fs/erofs/zdata.c

+7 −16

Original line number	Diff line number	Diff line
		@@ -1148,20 +1148,6 @@ static void move_to_bypass_jobqueue(struct z_erofs_pcluster *pcl,
		qtail[JQ_BYPASS] = &pcl->next;
		}

		static bool postsubmit_is_all_bypassed(struct z_erofs_decompressqueue *q[],
		unsigned int nr_bios, bool force_fg)
		{
		/*
		* although background is preferred, no one is pending for submission.
		* don't issue workqueue for decompression but drop it directly instead.
		*/
		if (force_fg \|\| nr_bios)
		return false;

		kvfree(q[JQ_SUBMIT]);
		return true;
		}

		static bool z_erofs_submit_queue(struct super_block *sb,
		z_erofs_next_pcluster_t owned_head,
		struct list_head *pagepool,
		@@ -1262,9 +1248,14 @@ skippage:
		if (bio)
		submit_bio(bio);

		if (postsubmit_is_all_bypassed(q, nr_bios, *force_fg))
		/*
		* although background is preferred, no one is pending for submission.
		* don't issue workqueue for decompression but drop it directly instead.
		*/
		if (!*force_fg && !nr_bios) {
		kvfree(q[JQ_SUBMIT]);
		return true;

		}
		z_erofs_decompress_kickoff(q[JQ_SUBMIT], *force_fg, nr_bios);
		return true;
		}