Skip to content

Commit 1619224

Browse files
Matthew Wilcox (Oracle)Jaegeuk Kim
authored andcommitted
f2fs: Convert set_page_private_data() to folio_set_f2fs_data()
The only caller has a folio, so pass it in and operate on it. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent a824388 commit 1619224

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

fs/f2fs/compress.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1953,7 +1953,7 @@ void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi, struct page *page,
19531953
return;
19541954
}
19551955

1956-
set_page_private_data(&cfolio->page, ino);
1956+
folio_set_f2fs_data(cfolio, ino);
19571957

19581958
memcpy(folio_address(cfolio), page_address(page), PAGE_SIZE);
19591959
folio_mark_uptodate(cfolio);

fs/f2fs/f2fs.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2537,12 +2537,14 @@ static inline unsigned long get_page_private_data(struct page *page)
25372537
return data >> PAGE_PRIVATE_MAX;
25382538
}
25392539

2540-
static inline void set_page_private_data(struct page *page, unsigned long data)
2540+
static inline void folio_set_f2fs_data(struct folio *folio, unsigned long data)
25412541
{
2542-
if (!PagePrivate(page))
2543-
attach_page_private(page, (void *)0);
2544-
set_bit(PAGE_PRIVATE_NOT_POINTER, &page_private(page));
2545-
page_private(page) |= data << PAGE_PRIVATE_MAX;
2542+
data = (1UL << PAGE_PRIVATE_NOT_POINTER) | (data << PAGE_PRIVATE_MAX);
2543+
2544+
if (!folio_test_private(folio))
2545+
folio_attach_private(folio, (void *)data);
2546+
else
2547+
folio->private = (void *)((unsigned long)folio->private | data);
25462548
}
25472549

25482550
static inline void clear_page_private_data(struct page *page)

0 commit comments

Comments
 (0)