diff options
author | Hugh Dickins <hughd@google.com> | 2011-08-03 19:21:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 20:25:24 -0400 |
commit | 8079b1c859c44f27d63da4951f5038a16589a563 (patch) | |
tree | 677e77a4c9d3b9c33427196cb5f860ebcf530b15 /mm/mincore.c | |
parent | e504f3fdd63d486d45b18009e5a65f2e329acb0a (diff) |
mm: clarify the radix_tree exceptional cases
Make the radix_tree exceptional cases, mostly in filemap.c, clearer.
It's hard to devise a suitable snappy name that illuminates the use by
shmem/tmpfs for swap, while keeping filemap/pagecache/radix_tree
generality. And akpm points out that /* radix_tree_deref_retry(page) */
comments look like calls that have been commented out for unknown
reason.
Skirt the naming difficulty by rearranging these blocks to handle the
transient radix_tree_deref_retry(page) case first; then just explain the
remaining shmem/tmpfs swap case in a comment.
Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/mincore.c')
-rw-r--r-- | mm/mincore.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/mincore.c b/mm/mincore.c index 733f1829b0dc..636a86876ff2 100644 --- a/mm/mincore.c +++ b/mm/mincore.c | |||
@@ -72,6 +72,7 @@ static unsigned char mincore_page(struct address_space *mapping, pgoff_t pgoff) | |||
72 | */ | 72 | */ |
73 | page = find_get_page(mapping, pgoff); | 73 | page = find_get_page(mapping, pgoff); |
74 | #ifdef CONFIG_SWAP | 74 | #ifdef CONFIG_SWAP |
75 | /* shmem/tmpfs may return swap: account for swapcache page too. */ | ||
75 | if (radix_tree_exceptional_entry(page)) { | 76 | if (radix_tree_exceptional_entry(page)) { |
76 | swp_entry_t swap = radix_to_swp_entry(page); | 77 | swp_entry_t swap = radix_to_swp_entry(page); |
77 | page = find_get_page(&swapper_space, swap.val); | 78 | page = find_get_page(&swapper_space, swap.val); |