ext4: use pagevec_lookup_range() in writeback code (2b85a617) · Commits · 戴 / test

fs/ext4/inode.c

+5 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1720,13 +1720,13 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,

	pagevec_init(&pvec, 0);		pagevec_init(&pvec, 0);
	while (index <= end) {		while (index <= end) {
	nr_pages = pagevec_lookup(&pvec, mapping, &index, PAGEVEC_SIZE);		nr_pages = pagevec_lookup_range(&pvec, mapping, &index, end,
			PAGEVEC_SIZE);
	if (nr_pages == 0)		if (nr_pages == 0)
	break;		break;
	for (i = 0; i < nr_pages; i++) {		for (i = 0; i < nr_pages; i++) {
	struct page *page = pvec.pages[i];		struct page *page = pvec.pages[i];
	if (page->index > end)
	break;
	BUG_ON(!PageLocked(page));		BUG_ON(!PageLocked(page));
	BUG_ON(PageWriteback(page));		BUG_ON(PageWriteback(page));
	if (invalidate) {		if (invalidate) {
	@@ -2347,15 +2347,13 @@ static int mpage_map_and_submit_buffers(struct mpage_da_data *mpd)

	pagevec_init(&pvec, 0);		pagevec_init(&pvec, 0);
	while (start <= end) {		while (start <= end) {
	nr_pages = pagevec_lookup(&pvec, inode->i_mapping, &start,		nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping,
	PAGEVEC_SIZE);		&start, end, PAGEVEC_SIZE);
	if (nr_pages == 0)		if (nr_pages == 0)
	break;		break;
	for (i = 0; i < nr_pages; i++) {		for (i = 0; i < nr_pages; i++) {
	struct page *page = pvec.pages[i];		struct page *page = pvec.pages[i];

	if (page->index > end)
	break;
	bh = head = page_buffers(page);		bh = head = page_buffers(page);
	do {		do {
	if (lblk < mpd->map.m_lblk)		if (lblk < mpd->map.m_lblk)