erofs: insert to managed cache after adding to pcl (bf225074) · Commits · 戴 / test

fs/erofs/zdata.c

+9 −17

Original line number	Diff line number	Diff line
		@@ -1065,29 +1065,21 @@ repeat:
		put_page(page);
		out_allocpage:
		page = erofs_allocpage(pagepool, gfp \| __GFP_NOFAIL);
		if (!tocache \|\| add_to_page_cache_lru(page, mc, index + nr, gfp)) {
		/* turn into temporary page if fails */
		set_page_private(page, Z_EROFS_SHORTLIVED_PAGE);
		tocache = false;
		}

		if (oldpage != cmpxchg(&pcl->compressed_pages[nr], oldpage, page)) {
		if (tocache) {
		/* since it added to managed cache successfully */
		unlock_page(page);
		put_page(page);
		} else {
		list_add(&page->lru, pagepool);
		}
		cond_resched();
		goto repeat;
		}

		if (tocache) {
		if (!tocache \|\| add_to_page_cache_lru(page, mc, index + nr, gfp)) {
		/* turn into temporary page if fails (1 ref) */
		set_page_private(page, Z_EROFS_SHORTLIVED_PAGE);
		goto out;
		}
		attach_page_private(page, pcl);
		/* drop a ref added by allocpage (then we have 2 refs here) */
		/* drop a refcount added by allocpage (then we have 2 refs here) */
		put_page(page);
		}

		out: /* the only exit (for tracing and debugging) */
		return page;
		}