@@ -618,21 +618,21 @@ int ext2_delete_entry(struct ext2_dir_entry_2 *dir, struct folio *folio)
618
618
*/
619
619
int ext2_make_empty (struct inode * inode , struct inode * parent )
620
620
{
621
- struct page * page = grab_cache_page (inode -> i_mapping , 0 );
621
+ struct folio * folio = filemap_grab_folio (inode -> i_mapping , 0 );
622
622
unsigned chunk_size = ext2_chunk_size (inode );
623
623
struct ext2_dir_entry_2 * de ;
624
624
int err ;
625
625
void * kaddr ;
626
626
627
- if (! page )
628
- return - ENOMEM ;
627
+ if (IS_ERR ( folio ) )
628
+ return PTR_ERR ( folio ) ;
629
629
630
- err = ext2_prepare_chunk (page , 0 , chunk_size );
630
+ err = ext2_prepare_chunk (& folio -> page , 0 , chunk_size );
631
631
if (err ) {
632
- unlock_page ( page );
632
+ folio_unlock ( folio );
633
633
goto fail ;
634
634
}
635
- kaddr = kmap_local_page ( page );
635
+ kaddr = kmap_local_folio ( folio , 0 );
636
636
memset (kaddr , 0 , chunk_size );
637
637
de = (struct ext2_dir_entry_2 * )kaddr ;
638
638
de -> name_len = 1 ;
@@ -648,10 +648,10 @@ int ext2_make_empty(struct inode *inode, struct inode *parent)
648
648
memcpy (de -> name , "..\0" , 4 );
649
649
ext2_set_de_type (de , inode );
650
650
kunmap_local (kaddr );
651
- ext2_commit_chunk (page , 0 , chunk_size );
651
+ ext2_commit_chunk (& folio -> page , 0 , chunk_size );
652
652
err = ext2_handle_dirsync (inode );
653
653
fail :
654
- put_page ( page );
654
+ folio_put ( folio );
655
655
return err ;
656
656
}
657
657
0 commit comments