Commit 5a5cad8c authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton

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.comSigned-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent ff5710c3
...@@ -45,34 +45,36 @@ int nilfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) ...@@ -45,34 +45,36 @@ int nilfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf) static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf)
{ {
struct vm_area_struct *vma = vmf->vma; struct vm_area_struct *vma = vmf->vma;
struct page *page = vmf->page; struct folio *folio = page_folio(vmf->page);
struct inode *inode = file_inode(vma->vm_file); struct inode *inode = file_inode(vma->vm_file);
struct nilfs_transaction_info ti; struct nilfs_transaction_info ti;
struct buffer_head *bh, *head;
int ret = 0; int ret = 0;
if (unlikely(nilfs_near_disk_full(inode->i_sb->s_fs_info))) if (unlikely(nilfs_near_disk_full(inode->i_sb->s_fs_info)))
return VM_FAULT_SIGBUS; /* -ENOSPC */ return VM_FAULT_SIGBUS; /* -ENOSPC */
sb_start_pagefault(inode->i_sb); sb_start_pagefault(inode->i_sb);
lock_page(page); folio_lock(folio);
if (page->mapping != inode->i_mapping || if (folio->mapping != inode->i_mapping ||
page_offset(page) >= i_size_read(inode) || !PageUptodate(page)) { folio_pos(folio) >= i_size_read(inode) ||
unlock_page(page); !folio_test_uptodate(folio)) {
folio_unlock(folio);
ret = -EFAULT; /* make the VM retry the fault */ ret = -EFAULT; /* make the VM retry the fault */
goto out; goto out;
} }
/* /*
* check to see if the page is mapped already (no holes) * check to see if the folio is mapped already (no holes)
*/ */
if (PageMappedToDisk(page)) if (folio_test_mappedtodisk(folio))
goto mapped; goto mapped;
if (page_has_buffers(page)) { head = folio_buffers(folio);
struct buffer_head *bh, *head; if (head) {
int fully_mapped = 1; int fully_mapped = 1;
bh = head = page_buffers(page); bh = head;
do { do {
if (!buffer_mapped(bh)) { if (!buffer_mapped(bh)) {
fully_mapped = 0; fully_mapped = 0;
...@@ -81,11 +83,11 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf) ...@@ -81,11 +83,11 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf)
} while (bh = bh->b_this_page, bh != head); } while (bh = bh->b_this_page, bh != head);
if (fully_mapped) { if (fully_mapped) {
SetPageMappedToDisk(page); folio_set_mappedtodisk(folio);
goto mapped; goto mapped;
} }
} }
unlock_page(page); folio_unlock(folio);
/* /*
* fill hole blocks * fill hole blocks
...@@ -105,7 +107,7 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf) ...@@ -105,7 +107,7 @@ static vm_fault_t nilfs_page_mkwrite(struct vm_fault *vmf)
nilfs_transaction_commit(inode->i_sb); nilfs_transaction_commit(inode->i_sb);
mapped: mapped:
wait_for_stable_page(page); folio_wait_stable(folio);
out: out:
sb_end_pagefault(inode->i_sb); sb_end_pagefault(inode->i_sb);
return vmf_fs_error(ret); return vmf_fs_error(ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment