diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-02-09 20:21:34 +0000 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-03-15 08:23:29 -0400 |
| commit | 7ba13abbd31ee9265e88d7dc029c0f786e665192 (patch) | |
| tree | 9a4df1920def2d796607fee2c2b8b229c82b7e69 /fs/ntfs | |
| parent | d82354f6b05fc3b35029b3f75ddbf41b82af3bc8 (diff) | |
| download | linux-7ba13abbd31ee9265e88d7dc029c0f786e665192.tar.gz linux-7ba13abbd31ee9265e88d7dc029c0f786e665192.tar.bz2 linux-7ba13abbd31ee9265e88d7dc029c0f786e665192.zip | |
fs: Turn block_invalidatepage into block_invalidate_folio
Remove special-casing of a NULL invalidatepage, since there is no
more block_invalidatepage.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Mike Marshall <hubcap@omnibond.com> # orangefs
Tested-by: David Howells <dhowells@redhat.com> # afs
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/aops.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index bb0a43860ad2..6858bf6df49a 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c @@ -1350,12 +1350,13 @@ retry_writepage: /* Is the page fully outside i_size? (truncate in progress) */ if (unlikely(page->index >= (i_size + PAGE_SIZE - 1) >> PAGE_SHIFT)) { + struct folio *folio = page_folio(page); /* * The page may have dirty, unmapped buffers. Make them * freeable here, so the page does not leak. */ - block_invalidatepage(page, 0, PAGE_SIZE); - unlock_page(page); + block_invalidate_folio(folio, 0, folio_size(folio)); + folio_unlock(folio); ntfs_debug("Write outside i_size - truncated?"); return 0; } |