Commit f4b830cf authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Jan Kara
Browse files

ext2: Convert ext2_empty_dir() to use a folio 



Save two calls to compound_head() by using the folio API.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Message-Id: <20230921200746.3303942-6-willy@infradead.org>
parent 1de0736c

fs/ext2/dir.c

+5 −5
Original line number Diff line number Diff line
@@ -671,14 +671,14 @@ int ext2_make_empty(struct inode *inode, struct inode *parent) 
 */

int ext2_empty_dir(struct inode *inode)

{

	struct page *page;

	struct folio *folio;

	char *kaddr;

	unsigned long i, npages = dir_pages(inode);



	for (i = 0; i < npages; i++) {

		ext2_dirent *de;



		kaddr = ext2_get_page(inode, i, 0, &page);

		kaddr = ext2_get_folio(inode, i, 0, &folio);

		if (IS_ERR(kaddr))

			return 0;
@@ -707,12 +707,12 @@ int ext2_empty_dir (struct inode * inode) 
			}

			de = ext2_next_entry(de);

		}

		ext2_put_page(page, kaddr);

		folio_release_kmap(folio, kaddr);

	}

	return 1;



not_empty:

	ext2_put_page(page, kaddr);

	folio_release_kmap(folio, kaddr);

	return 0;

}