Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fs_for_v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull isofs update from Jan Kara:
"Partial conversion of isofs to folios"
* tag 'fs_for_v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
isofs: Partially convert zisofs_read_folio to use a folio
+5
-7
+5
-7
fs/isofs/compress.c
+5
-7
fs/isofs/compress.c
···
301
301
*/
302
302
static int zisofs_read_folio(struct file *file, struct folio *folio)
303
303
{
304
-
struct page *page = &folio->page;
305
304
struct inode *inode = file_inode(file);
306
305
struct address_space *mapping = inode->i_mapping;
307
306
int err;
···
310
311
PAGE_SHIFT <= zisofs_block_shift ?
311
312
(1 << (zisofs_block_shift - PAGE_SHIFT)) : 0;
312
313
struct page **pages;
313
-
pgoff_t index = page->index, end_index;
314
+
pgoff_t index = folio->index, end_index;
314
315
315
316
end_index = (inode->i_size + PAGE_SIZE - 1) >> PAGE_SHIFT;
316
317
/*
317
-
* If this page is wholly outside i_size we just return zero;
318
+
* If this folio is wholly outside i_size we just return zero;
318
319
* do_generic_file_read() will handle this for us
319
320
*/
320
321
if (index >= end_index) {
321
-
SetPageUptodate(page);
322
-
unlock_page(page);
322
+
folio_end_read(folio, true);
323
323
return 0;
324
324
}
325
325
···
336
338
pages = kcalloc(max_t(unsigned int, zisofs_pages_per_cblock, 1),
337
339
sizeof(*pages), GFP_KERNEL);
338
340
if (!pages) {
339
-
unlock_page(page);
341
+
folio_unlock(folio);
340
342
return -ENOMEM;
341
343
}
342
-
pages[full_page] = page;
344
+
pages[full_page] = &folio->page;
343
345
344
346
for (i = 0; i < pcount; i++, index++) {
345
347
if (i != full_page)