Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

buffer: convert block_truncate_page() to use a folio

Browse Source 
Support large folios in block_truncate_page() and avoid three hidden calls
to compound_head().

[willy@infradead.org: fix check of filemap_grab_folio() return value]
  Link: https://lkml.kernel.org/r/ZItZOt+XxV12HtzL@casper.infradead.org
Link: https://lkml.kernel.org/r/20230612210141.730128-15-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Bob Peterson <rpeterso@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:41 +01:00 committed by Andrew Morton
parent eee25182a8
commit 6d68f644b9
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/buffer.c
View File

@ -2598,17 +2598,16 @@ int block_truncate_page(struct address_space *mapping,
loff_t from, get_block_t *get_block) loff_t from, get_block_t *get_block)
{ {
pgoff_t index = from >> PAGE_SHIFT; pgoff_t index = from >> PAGE_SHIFT;
unsigned offset = from & (PAGE_SIZE-1);
unsigned blocksize; unsigned blocksize;
sector_t iblock; sector_t iblock;
unsigned length, pos; size_t offset, length, pos;
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
struct page *page; struct folio *folio;
struct buffer_head *bh; struct buffer_head *bh;
int err = 0; int err = 0;
blocksize = i_blocksize(inode); blocksize = i_blocksize(inode);
length = offset & (blocksize - 1); length = from & (blocksize - 1);
/* Block boundary? Nothing to do */ /* Block boundary? Nothing to do */
if (!length) if (!length)
@ -2617,15 +2616,18 @@ int block_truncate_page(struct address_space *mapping,
length = blocksize - length; length = blocksize - length;
iblock = (sector_t)index << (PAGE_SHIFT - inode->i_blkbits); iblock = (sector_t)index << (PAGE_SHIFT - inode->i_blkbits);
page = grab_cache_page(mapping, index); folio = filemap_grab_folio(mapping, index);
if (!page) if (IS_ERR(folio))
return -ENOMEM; return PTR_ERR(folio);
if (!page_has_buffers(page)) bh = folio_buffers(folio);
create_empty_buffers(page, blocksize, 0); if (!bh) {
folio_create_empty_buffers(folio, blocksize, 0);
bh = folio_buffers(folio);
}
/* Find the buffer that contains "offset" */ /* Find the buffer that contains "offset" */
bh = page_buffers(page); offset = offset_in_folio(folio, from);
pos = blocksize; pos = blocksize;
while (offset >= pos) { while (offset >= pos) {
bh = bh->b_this_page; bh = bh->b_this_page;
@ -2644,7 +2646,7 @@ int block_truncate_page(struct address_space *mapping,
} }
/* Ok, it's mapped. Make sure it's up-to-date */ /* Ok, it's mapped. Make sure it's up-to-date */
if (PageUptodate(page)) if (folio_test_uptodate(folio))
set_buffer_uptodate(bh); set_buffer_uptodate(bh);
if (!buffer_uptodate(bh) && !buffer_delay(bh) && !buffer_unwritten(bh)) { if (!buffer_uptodate(bh) && !buffer_delay(bh) && !buffer_unwritten(bh)) {
@ -2654,12 +2656,12 @@ int block_truncate_page(struct address_space *mapping,
goto unlock; goto unlock;
} }
zero_user(page, offset, length); folio_zero_range(folio, offset, length);
mark_buffer_dirty(bh); mark_buffer_dirty(bh);
unlock: unlock:
unlock_page(page); folio_unlock(folio);
put_page(page); folio_put(folio);
return err; return err;
} }