Skip to content

Commit 66bca01

Browse files
Matthew Wilcox (Oracle)Jaegeuk Kim
authored andcommitted
f2fs: Pass a folio to set_nid()
All callers have a folio, so pass it in. Removes two calls to compound_head(). 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 f923792 commit 66bca01

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

fs/f2fs/node.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ int f2fs_get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode)
818818
goto release_pages;
819819
}
820820

821-
set_nid(&parent->page, offset[i - 1], nids[i], i == 1);
821+
set_nid(parent, offset[i - 1], nids[i], i == 1);
822822
f2fs_alloc_nid_done(sbi, nids[i]);
823823
done = true;
824824
} else if (mode == LOOKUP_NODE_RA && i == level && level > 1) {
@@ -1017,7 +1017,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,
10171017
ret = truncate_dnode(&rdn);
10181018
if (ret < 0)
10191019
goto out_err;
1020-
if (set_nid(&folio->page, i, 0, false))
1020+
if (set_nid(folio, i, 0, false))
10211021
dn->node_changed = true;
10221022
}
10231023
} else {
@@ -1031,7 +1031,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,
10311031
rdn.nid = child_nid;
10321032
ret = truncate_nodes(&rdn, child_nofs, 0, depth - 1);
10331033
if (ret == (NIDS_PER_BLOCK + 1)) {
1034-
if (set_nid(&folio->page, i, 0, false))
1034+
if (set_nid(folio, i, 0, false))
10351035
dn->node_changed = true;
10361036
child_nofs += ret;
10371037
} else if (ret < 0 && ret != -ENOENT) {
@@ -1097,7 +1097,7 @@ static int truncate_partial_nodes(struct dnode_of_data *dn,
10971097
err = truncate_dnode(dn);
10981098
if (err < 0)
10991099
goto fail;
1100-
if (set_nid(&folios[idx]->page, i, 0, false))
1100+
if (set_nid(folios[idx], i, 0, false))
11011101
dn->node_changed = true;
11021102
}
11031103

@@ -1223,7 +1223,7 @@ int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from)
12231223
if (offset[1] == 0 && get_nid(&folio->page, offset[0], true)) {
12241224
folio_lock(folio);
12251225
BUG_ON(folio->mapping != NODE_MAPPING(sbi));
1226-
set_nid(&folio->page, offset[0], 0, true);
1226+
set_nid(folio, offset[0], 0, true);
12271227
folio_unlock(folio);
12281228
}
12291229
offset[1] = 0;

fs/f2fs/node.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,17 +367,17 @@ static inline bool IS_DNODE(const struct page *node_page)
367367
return true;
368368
}
369369

370-
static inline int set_nid(struct page *p, int off, nid_t nid, bool i)
370+
static inline int set_nid(struct folio *folio, int off, nid_t nid, bool i)
371371
{
372-
struct f2fs_node *rn = F2FS_NODE(p);
372+
struct f2fs_node *rn = F2FS_NODE(&folio->page);
373373

374-
f2fs_wait_on_page_writeback(p, NODE, true, true);
374+
f2fs_folio_wait_writeback(folio, NODE, true, true);
375375

376376
if (i)
377377
rn->i.i_nid[off - NODE_DIR1_BLOCK] = cpu_to_le32(nid);
378378
else
379379
rn->in.nid[off] = cpu_to_le32(nid);
380-
return set_page_dirty(p);
380+
return folio_mark_dirty(folio);
381381
}
382382

383383
static inline nid_t get_nid(struct page *p, int off, bool i)

0 commit comments

Comments
 (0)