lkml.org 
[lkml]   [2017]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 62/73] dax: Convert dax_insert_pfn_mkwrite to XArray
    Date
    From: Matthew Wilcox <mawilcox@microsoft.com>

    Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
    ---
    fs/dax.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/fs/dax.c b/fs/dax.c
    index 7bd94f1b61d0..619aff70583f 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.0
    \
     
     \ /
      Last update: 2017-12-06 01:45    [W:4.025 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site