korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 12:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

gfs2: pass a folio to __gfs2_jdata_write_folio()

Browse Source 
Remove a couple of folio->page conversions in the callers, and two calls
to compound_head() in the function itself.  Rename it from
__gfs2_jdata_writepage() to __gfs2_jdata_write_folio().

Link: https://lkml.kernel.org/r/20230612210141.730128-3-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2023-06-12 22:01:29 +01:00 committed by Andrew Morton
parent c0ba597db9
commit d0cfcaee0a
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/gfs2/aops.c
View File

@ -113,30 +113,31 @@ static int gfs2_write_jdata_page(struct page *page,
} }
/** /**
* __gfs2_jdata_writepage - The core of jdata writepage * __gfs2_jdata_write_folio - The core of jdata writepage
* @page: The page to write * @folio: The folio to write
* @wbc: The writeback control * @wbc: The writeback control
* *
* This is shared between writepage and writepages and implements the * This is shared between writepage and writepages and implements the
* core of the writepage operation. If a transaction is required then * core of the writepage operation. If a transaction is required then
* PageChecked will have been set and the transaction will have * the checked flag will have been set and the transaction will have
* already been started before this is called. * already been started before this is called.
*/ */
static int __gfs2_jdata_write_folio(struct folio *folio,
static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *wbc) struct writeback_control *wbc)
{ {
struct inode *inode = page->mapping->host; struct inode *inode = folio->mapping->host;
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
if (PageChecked(page)) { if (folio_test_checked(folio)) {
ClearPageChecked(page); folio_clear_checked(folio);
if (!page_has_buffers(page)) { if (!folio_buffers(folio)) {
create_empty_buffers(page, inode->i_sb->s_blocksize, folio_create_empty_buffers(folio,
inode->i_sb->s_blocksize,
BIT(BH_Dirty)|BIT(BH_Uptodate)); BIT(BH_Dirty)|BIT(BH_Uptodate));
} }
gfs2_trans_add_databufs(ip, page_folio(page), 0, PAGE_SIZE); gfs2_trans_add_databufs(ip, folio, 0, folio_size(folio));
} }
return gfs2_write_jdata_page(page, wbc); return gfs2_write_jdata_page(&folio->page, wbc);
} }
/** /**
@ -159,7 +160,7 @@ static int gfs2_jdata_writepage(struct page *page, struct writeback_control *wbc
goto out; goto out;
if (folio_test_checked(folio) || current->journal_info) if (folio_test_checked(folio) || current->journal_info)
goto out_ignore; goto out_ignore;
return __gfs2_jdata_writepage(&folio->page, wbc); return __gfs2_jdata_write_folio(folio, wbc);
out_ignore: out_ignore:
folio_redirty_for_writepage(wbc, folio); folio_redirty_for_writepage(wbc, folio);
@ -256,7 +257,7 @@ continue_unlock:
trace_wbc_writepage(wbc, inode_to_bdi(inode)); trace_wbc_writepage(wbc, inode_to_bdi(inode));
ret = __gfs2_jdata_writepage(&folio->page, wbc); ret = __gfs2_jdata_write_folio(folio, wbc);
if (unlikely(ret)) { if (unlikely(ret)) {
if (ret == AOP_WRITEPAGE_ACTIVATE) { if (ret == AOP_WRITEPAGE_ACTIVATE) {
folio_unlock(folio); folio_unlock(folio);