android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

splice: Use a folio in page_cache_pipe_buf_try_steal()

Browse Source 
This saves a lot of calls to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-02-11 23:39:03 -05:00
parent be7c07d60e
commit b9ccad2e5d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/splice.c
View File

@ -47,26 +47,27 @@ static bool page_cache_pipe_buf_try_steal(struct pipe_inode_info *pipe,
struct pipe_buffer *buf) struct pipe_buffer *buf)
{ {
struct page *page = buf->page; struct page *page = buf->page;
struct folio *folio = page_folio(page);
struct address_space *mapping; struct address_space *mapping;
lock_page(page); folio_lock(folio);
mapping = page_mapping(page); mapping = folio_mapping(folio);
if (mapping) { if (mapping) {
WARN_ON(!PageUptodate(page)); WARN_ON(!folio_test_uptodate(folio));
/* /*
* At least for ext2 with nobh option, we need to wait on * At least for ext2 with nobh option, we need to wait on
* writeback completing on this page, since we'll remove it * writeback completing on this folio, since we'll remove it
* from the pagecache. Otherwise truncate wont wait on the * from the pagecache. Otherwise truncate wont wait on the
* page, allowing the disk blocks to be reused by someone else * folio, allowing the disk blocks to be reused by someone else
* before we actually wrote our data to them. fs corruption * before we actually wrote our data to them. fs corruption
* ensues. * ensues.
*/ */
wait_on_page_writeback(page); folio_wait_writeback(folio);
if (page_has_private(page) && if (folio_has_private(folio) &&
!try_to_release_page(page, GFP_KERNEL)) !filemap_release_folio(folio, GFP_KERNEL))
goto out_unlock; goto out_unlock;
/* /*
@ -80,11 +81,11 @@ static bool page_cache_pipe_buf_try_steal(struct pipe_inode_info *pipe,
} }
/* /*
* Raced with truncate or failed to remove page from current * Raced with truncate or failed to remove folio from current
* address space, unlock and return failure. * address space, unlock and return failure.
*/ */
out_unlock: out_unlock:
unlock_page(page); folio_unlock(folio);
return false; return false;
} }