Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
nilfs2: convert nilfs_page_mkwrite() to use a folio
Using the new folio APIs saves seven hidden calls to compound_head().
Link: https://lkml.kernel.org/r/20231114084436.2755-12-konishi.ryusuke@gmail.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
authored by
Matthew Wilcox (Oracle)
and committed by
Andrew Morton
5a5cad8c
ff5710c3
+15
-13
+15
-13
fs/nilfs2/file.c
+15
-13
fs/nilfs2/file.c
···
45
45
static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf)
46
46
{
47
47
struct vm_area_struct *vma = vmf->vma;
48
-
struct page *page = vmf->page;
48
+
struct folio *folio = page_folio(vmf->page);
49
49
struct inode *inode = file_inode(vma->vm_file);
50
50
struct nilfs_transaction_info ti;
51
+
struct buffer_head *bh, *head;
51
52
int ret = 0;
52
53
53
54
if (unlikely(nilfs_near_disk_full(inode->i_sb->s_fs_info)))
54
55
return VM_FAULT_SIGBUS; /* -ENOSPC */
55
56
56
57
sb_start_pagefault(inode->i_sb);
57
-
lock_page(page);
58
-
if (page->mapping != inode->i_mapping ||
59
-
page_offset(page) >= i_size_read(inode) || !PageUptodate(page)) {
60
-
unlock_page(page);
58
+
folio_lock(folio);
59
+
if (folio->mapping != inode->i_mapping ||
60
+
folio_pos(folio) >= i_size_read(inode) ||
61
+
!folio_test_uptodate(folio)) {
62
+
folio_unlock(folio);
61
63
ret = -EFAULT; /* make the VM retry the fault */
62
64
goto out;
63
65
}
64
66
65
67
/*
66
-
* check to see if the page is mapped already (no holes)
68
+
* check to see if the folio is mapped already (no holes)
67
69
*/
68
-
if (PageMappedToDisk(page))
70
+
if (folio_test_mappedtodisk(folio))
69
71
goto mapped;
70
72
71
-
if (page_has_buffers(page)) {
72
-
struct buffer_head *bh, *head;
73
+
head = folio_buffers(folio);
74
+
if (head) {
73
75
int fully_mapped = 1;
74
76
75
-
bh = head = page_buffers(page);
77
+
bh = head;
76
78
do {
77
79
if (!buffer_mapped(bh)) {
78
80
fully_mapped = 0;
···
83
81
} while (bh = bh->b_this_page, bh != head);
84
82
85
83
if (fully_mapped) {
86
-
SetPageMappedToDisk(page);
84
+
folio_set_mappedtodisk(folio);
87
85
goto mapped;
88
86
}
89
87
}
90
-
unlock_page(page);
88
+
folio_unlock(folio);
91
89
92
90
/*
93
91
* fill hole blocks
···
107
105
nilfs_transaction_commit(inode->i_sb);
108
106
109
107
mapped:
110
-
wait_for_stable_page(page);
108
+
folio_wait_stable(folio);
111
109
out:
112
110
sb_end_pagefault(inode->i_sb);
113
111
return vmf_fs_error(ret);