From: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx> Simple now that we already have an xa_state! Signed-off-by: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx> --- fs/dax.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 2629ffa70575..d3894c15609a 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -413,24 +413,24 @@ static int __dax_invalidate_mapping_entry(struct address_space *mapping, XA_STATE(xas, &mapping->pages, index); int ret = 0; void *entry; - struct radix_tree_root *pages = &mapping->pages; xa_lock_irq(&mapping->pages); entry = get_unlocked_mapping_entry(&xas); if (!entry || WARN_ON_ONCE(!xa_is_value(entry))) goto out; if (!trunc && - (radix_tree_tag_get(pages, index, PAGECACHE_TAG_DIRTY) || - radix_tree_tag_get(pages, index, PAGECACHE_TAG_TOWRITE))) + (xas_get_tag(&xas, PAGECACHE_TAG_DIRTY) || + xas_get_tag(&xas, PAGECACHE_TAG_TOWRITE))) goto out; - radix_tree_delete(pages, index); + xas_store(&xas, NULL); mapping->nrexceptional--; ret = 1; out: put_unlocked_mapping_entry(&xas, entry); - xa_unlock_irq(&mapping->pages); + xas_unlock_irq(&xas); return ret; } + /* * Delete DAX entry at @index from @mapping. Wait for it * to be unlocked before deleting it. -- 2.15.1
