Skip to content

Commit f4b830c

Browse files
Matthew Wilcox (Oracle)jankara
authored andcommitted
ext2: Convert ext2_empty_dir() to use a folio
Save two calls to compound_head() by using the folio API. Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Signed-off-by: Jan Kara <[email protected]> Message-Id: <[email protected]>
1 parent 1de0736 commit f4b830c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fs/ext2/dir.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -669,16 +669,16 @@ int ext2_make_empty(struct inode *inode, struct inode *parent)
669669
/*
670670
* routine to check that the specified directory is empty (for rmdir)
671671
*/
672-
int ext2_empty_dir (struct inode * inode)
672+
int ext2_empty_dir(struct inode *inode)
673673
{
674-
struct page *page;
674+
struct folio *folio;
675675
char *kaddr;
676676
unsigned long i, npages = dir_pages(inode);
677677

678678
for (i = 0; i < npages; i++) {
679679
ext2_dirent *de;
680680

681-
kaddr = ext2_get_page(inode, i, 0, &page);
681+
kaddr = ext2_get_folio(inode, i, 0, &folio);
682682
if (IS_ERR(kaddr))
683683
return 0;
684684

@@ -707,12 +707,12 @@ int ext2_empty_dir (struct inode * inode)
707707
}
708708
de = ext2_next_entry(de);
709709
}
710-
ext2_put_page(page, kaddr);
710+
folio_release_kmap(folio, kaddr);
711711
}
712712
return 1;
713713

714714
not_empty:
715-
ext2_put_page(page, kaddr);
715+
folio_release_kmap(folio, kaddr);
716716
return 0;
717717
}
718718

0 commit comments

Comments
 (0)