@@ -80,11 +80,13 @@ struct meta_anchor {
80
80
};
81
81
#define mp_anchor (page ) ((struct meta_anchor *)page_private(page))
82
82
83
- static inline struct metapage * page_to_mp (struct page * page , int offset )
83
+ static inline struct metapage * folio_to_mp (struct folio * folio , int offset )
84
84
{
85
- if (!PagePrivate (page ))
85
+ struct meta_anchor * anchor = folio -> private ;
86
+
87
+ if (!anchor )
86
88
return NULL ;
87
- return mp_anchor ( page ) -> mp [offset >> L2PSIZE ];
89
+ return anchor -> mp [offset >> L2PSIZE ];
88
90
}
89
91
90
92
static inline int insert_metapage (struct folio * folio , struct metapage * mp )
@@ -144,9 +146,9 @@ static inline void dec_io(struct folio *folio, void (*handler) (struct folio *))
144
146
}
145
147
146
148
#else
147
- static inline struct metapage * page_to_mp (struct page * page , int offset )
149
+ static inline struct metapage * folio_to_mp (struct folio * folio , int offset )
148
150
{
149
- return PagePrivate ( page ) ? ( struct metapage * ) page_private ( page ) : NULL ;
151
+ return folio -> private ;
150
152
}
151
153
152
154
static inline int insert_metapage (struct folio * folio , struct metapage * mp )
@@ -303,7 +305,7 @@ static void last_write_complete(struct folio *folio)
303
305
unsigned int offset ;
304
306
305
307
for (offset = 0 ; offset < PAGE_SIZE ; offset += PSIZE ) {
306
- mp = page_to_mp ( & folio -> page , offset );
308
+ mp = folio_to_mp ( folio , offset );
307
309
if (mp && test_bit (META_io , & mp -> flag )) {
308
310
if (mp -> lsn )
309
311
remove_from_logsync (mp );
@@ -359,7 +361,7 @@ static int metapage_write_folio(struct folio *folio,
359
361
folio_start_writeback (folio );
360
362
361
363
for (offset = 0 ; offset < PAGE_SIZE ; offset += PSIZE ) {
362
- mp = page_to_mp ( & folio -> page , offset );
364
+ mp = folio_to_mp ( folio , offset );
363
365
364
366
if (!mp || !test_bit (META_dirty , & mp -> flag ))
365
367
continue ;
@@ -526,7 +528,7 @@ static bool metapage_release_folio(struct folio *folio, gfp_t gfp_mask)
526
528
int offset ;
527
529
528
530
for (offset = 0 ; offset < PAGE_SIZE ; offset += PSIZE ) {
529
- mp = page_to_mp ( & folio -> page , offset );
531
+ mp = folio_to_mp ( folio , offset );
530
532
531
533
if (!mp )
532
534
continue ;
@@ -620,7 +622,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
620
622
folio_lock (folio );
621
623
}
622
624
623
- mp = page_to_mp ( & folio -> page , page_offset );
625
+ mp = folio_to_mp ( folio , page_offset );
624
626
if (mp ) {
625
627
if (mp -> logical_size != size ) {
626
628
jfs_error (inode -> i_sb ,
@@ -804,7 +806,7 @@ void __invalidate_metapages(struct inode *ip, s64 addr, int len)
804
806
if (IS_ERR (folio ))
805
807
continue ;
806
808
for (offset = 0 ; offset < PAGE_SIZE ; offset += PSIZE ) {
807
- mp = page_to_mp ( & folio -> page , offset );
809
+ mp = folio_to_mp ( folio , offset );
808
810
if (!mp )
809
811
continue ;
810
812
if (mp -> index < addr )
0 commit comments