[PATCH v5 63/78] dax: Convert dax_insert_pfn_mkwrite to XArray
From: Matthew Wilcox <willy@infradead.org>
Date: 2017-12-15 22:04:35
Also in:
linux-f2fs-devel, linux-fsdevel, linux-mm, linux-usb, linux-xfs, lkml
Subsystem:
filesystem direct access (dax), filesystems (vfs and infrastructure), the rest · Maintainers:
Dan Williams, Alexander Viro, Christian Brauner, Linus Torvalds
From: Matthew Wilcox <redacted> Signed-off-by: Matthew Wilcox <redacted> --- fs/dax.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/dax.c b/fs/dax.c
index d6dd779e1b46..9cfd4fcc0b0d 100644
--- a/fs/dax.c
+++ b/fs/dax.c@@ -1498,21 +1498,21 @@ static int dax_insert_pfn_mkwrite(struct vm_fault *vmf, void *entry; int vmf_ret, error; - xa_lock_irq(&mapping->pages); + xas_lock_irq(&xas); entry = get_unlocked_mapping_entry(&xas); /* Did we race with someone splitting entry or so? */ if (!entry || (pe_size == PE_SIZE_PTE && !dax_is_pte_entry(entry)) || (pe_size == PE_SIZE_PMD && !dax_is_pmd_entry(entry))) { put_unlocked_mapping_entry(&xas, entry); - xa_unlock_irq(&mapping->pages); + xas_unlock_irq(&xas); trace_dax_insert_pfn_mkwrite_no_entry(mapping->host, vmf, VM_FAULT_NOPAGE); return VM_FAULT_NOPAGE; } - radix_tree_tag_set(&mapping->pages, index, PAGECACHE_TAG_DIRTY); + xas_set_tag(&xas, PAGECACHE_TAG_DIRTY); entry = lock_slot(&xas); - xa_unlock_irq(&mapping->pages); + xas_unlock_irq(&xas); switch (pe_size) { case PE_SIZE_PTE: error = vm_insert_mixed_mkwrite(vmf->vma, vmf->address, pfn);
--
2.15.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot