@@ -577,7 +577,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
577
577
int l2bsize ;
578
578
struct address_space * mapping ;
579
579
struct metapage * mp = NULL ;
580
- struct page * page ;
580
+ struct folio * folio ;
581
581
unsigned long page_index ;
582
582
unsigned long page_offset ;
583
583
@@ -608,22 +608,22 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
608
608
}
609
609
610
610
if (new && (PSIZE == PAGE_SIZE )) {
611
- page = grab_cache_page (mapping , page_index );
612
- if (! page ) {
613
- jfs_err ("grab_cache_page failed!" );
611
+ folio = filemap_grab_folio (mapping , page_index );
612
+ if (IS_ERR ( folio ) ) {
613
+ jfs_err ("filemap_grab_folio failed!" );
614
614
return NULL ;
615
615
}
616
- SetPageUptodate ( page );
616
+ folio_mark_uptodate ( folio );
617
617
} else {
618
- page = read_mapping_page (mapping , page_index , NULL );
619
- if (IS_ERR (page )) {
618
+ folio = read_mapping_folio (mapping , page_index , NULL );
619
+ if (IS_ERR (folio )) {
620
620
jfs_err ("read_mapping_page failed!" );
621
621
return NULL ;
622
622
}
623
- lock_page ( page );
623
+ folio_lock ( folio );
624
624
}
625
625
626
- mp = page_to_mp (page , page_offset );
626
+ mp = page_to_mp (& folio -> page , page_offset );
627
627
if (mp ) {
628
628
if (mp -> logical_size != size ) {
629
629
jfs_error (inode -> i_sb ,
@@ -649,16 +649,16 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
649
649
mp = alloc_metapage (GFP_NOFS );
650
650
if (!mp )
651
651
goto unlock ;
652
- mp -> page = page ;
652
+ mp -> page = & folio -> page ;
653
653
mp -> sb = inode -> i_sb ;
654
654
mp -> flag = 0 ;
655
655
mp -> xflag = COMMIT_PAGE ;
656
656
mp -> count = 1 ;
657
657
mp -> nohomeok = 0 ;
658
658
mp -> logical_size = size ;
659
- mp -> data = page_address ( page ) + page_offset ;
659
+ mp -> data = folio_address ( folio ) + page_offset ;
660
660
mp -> index = lblock ;
661
- if (unlikely (insert_metapage (page , mp ))) {
661
+ if (unlikely (insert_metapage (& folio -> page , mp ))) {
662
662
free_metapage (mp );
663
663
goto unlock ;
664
664
}
@@ -670,12 +670,12 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
670
670
memset (mp -> data , 0 , PSIZE );
671
671
}
672
672
673
- unlock_page ( page );
673
+ folio_unlock ( folio );
674
674
jfs_info ("__get_metapage: returning = 0x%p data = 0x%p" , mp , mp -> data );
675
675
return mp ;
676
676
677
677
unlock :
678
- unlock_page ( page );
678
+ folio_unlock ( folio );
679
679
return NULL ;
680
680
}
681
681
0 commit comments