Skip to content

Commit c910a64

Browse files
Matthew Wilcox (Oracle)Jaegeuk Kim
authored andcommitted
f2fs: Remove calls to folio_file_mapping()
All folios that f2fs sees belong to f2fs and not to the swapcache so it can dereference folio->mapping directly like all other filesystems do. Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Reviewed-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 19bbd30 commit c910a64

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

fs/f2fs/data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2455,7 +2455,7 @@ static int f2fs_mpage_readpages(struct inode *inode,
24552455

24562456
static int f2fs_read_data_folio(struct file *file, struct folio *folio)
24572457
{
2458-
struct inode *inode = folio_file_mapping(folio)->host;
2458+
struct inode *inode = folio->mapping->host;
24592459
int ret = -EAGAIN;
24602460

24612461
trace_f2fs_readpage(folio, DATA);

fs/f2fs/inline.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ bool f2fs_may_inline_dentry(struct inode *inode)
8181

8282
void f2fs_do_read_inline_data(struct folio *folio, struct page *ipage)
8383
{
84-
struct inode *inode = folio_file_mapping(folio)->host;
84+
struct inode *inode = folio->mapping->host;
8585

8686
if (folio_test_uptodate(folio))
8787
return;

include/trace/events/f2fs.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,12 +1322,11 @@ DECLARE_EVENT_CLASS(f2fs__folio,
13221322
),
13231323

13241324
TP_fast_assign(
1325-
__entry->dev = folio_file_mapping(folio)->host->i_sb->s_dev;
1326-
__entry->ino = folio_file_mapping(folio)->host->i_ino;
1325+
__entry->dev = folio->mapping->host->i_sb->s_dev;
1326+
__entry->ino = folio->mapping->host->i_ino;
13271327
__entry->type = type;
1328-
__entry->dir =
1329-
S_ISDIR(folio_file_mapping(folio)->host->i_mode);
1330-
__entry->index = folio_index(folio);
1328+
__entry->dir = S_ISDIR(folio->mapping->host->i_mode);
1329+
__entry->index = folio->index;
13311330
__entry->dirty = folio_test_dirty(folio);
13321331
__entry->uptodate = folio_test_uptodate(folio);
13331332
),

0 commit comments

Comments
 (0)