diff options
Diffstat (limited to 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 52517f28e6f4..4de14e75c4ec 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -127,7 +127,7 @@ static int page_cache_tree_insert(struct address_space *mapping, | |||
127 | 127 | ||
128 | p = radix_tree_deref_slot_protected(slot, | 128 | p = radix_tree_deref_slot_protected(slot, |
129 | &mapping->i_pages.xa_lock); | 129 | &mapping->i_pages.xa_lock); |
130 | if (!radix_tree_exceptional_entry(p)) | 130 | if (!xa_is_value(p)) |
131 | return -EEXIST; | 131 | return -EEXIST; |
132 | 132 | ||
133 | mapping->nrexceptional--; | 133 | mapping->nrexceptional--; |
@@ -336,7 +336,7 @@ page_cache_tree_delete_batch(struct address_space *mapping, | |||
336 | break; | 336 | break; |
337 | page = radix_tree_deref_slot_protected(slot, | 337 | page = radix_tree_deref_slot_protected(slot, |
338 | &mapping->i_pages.xa_lock); | 338 | &mapping->i_pages.xa_lock); |
339 | if (radix_tree_exceptional_entry(page)) | 339 | if (xa_is_value(page)) |
340 | continue; | 340 | continue; |
341 | if (!tail_pages) { | 341 | if (!tail_pages) { |
342 | /* | 342 | /* |
@@ -1355,7 +1355,7 @@ pgoff_t page_cache_next_hole(struct address_space *mapping, | |||
1355 | struct page *page; | 1355 | struct page *page; |
1356 | 1356 | ||
1357 | page = radix_tree_lookup(&mapping->i_pages, index); | 1357 | page = radix_tree_lookup(&mapping->i_pages, index); |
1358 | if (!page || radix_tree_exceptional_entry(page)) | 1358 | if (!page || xa_is_value(page)) |
1359 | break; | 1359 | break; |
1360 | index++; | 1360 | index++; |
1361 | if (index == 0) | 1361 | if (index == 0) |
@@ -1396,7 +1396,7 @@ pgoff_t page_cache_prev_hole(struct address_space *mapping, | |||
1396 | struct page *page; | 1396 | struct page *page; |
1397 | 1397 | ||
1398 | page = radix_tree_lookup(&mapping->i_pages, index); | 1398 | page = radix_tree_lookup(&mapping->i_pages, index); |
1399 | if (!page || radix_tree_exceptional_entry(page)) | 1399 | if (!page || xa_is_value(page)) |
1400 | break; | 1400 | break; |
1401 | index--; | 1401 | index--; |
1402 | if (index == ULONG_MAX) | 1402 | if (index == ULONG_MAX) |
@@ -1539,7 +1539,7 @@ struct page *pagecache_get_page(struct address_space *mapping, pgoff_t offset, | |||
1539 | 1539 | ||
1540 | repeat: | 1540 | repeat: |
1541 | page = find_get_entry(mapping, offset); | 1541 | page = find_get_entry(mapping, offset); |
1542 | if (radix_tree_exceptional_entry(page)) | 1542 | if (xa_is_value(page)) |
1543 | page = NULL; | 1543 | page = NULL; |
1544 | if (!page) | 1544 | if (!page) |
1545 | goto no_page; | 1545 | goto no_page; |