]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Remove mem_cgroup_shmem_charge_fallback(): it was only required when we
authorHugh Dickins <hughd@google.com>
Tue, 26 Jul 2011 10:14:54 +0000 (20:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 03:36:37 +0000 (13:36 +1000)
commitdad745406d7ea31730d87ae9c93144c87d5818f6
tree26de3b6a694cc5478ce69828ceac9b919b3be9a4
parentb274fab07913c022d24935efb024f17d52923ccb
Remove mem_cgroup_shmem_charge_fallback(): it was only required when we
had to move swappage to filecache with GFP_NOWAIT.

Remove the GFP_NOWAIT special case from mem_cgroup_cache_charge(), by
moving its call out from shmem_add_to_page_cache() to two of thats three
callers.  But leave it doing mem_cgroup_uncharge_cache_page() on error:
although asymmetrical, it's easier for all 3 callers to handle.

These two changes would also be appropriate if anyone were to start using
shmem_read_mapping_page_gfp() with GFP_NOWAIT.

Remove mem_cgroup_get_shmem_target(): mc_handle_file_pte() can test
radix_tree_exceptional_entry() to get what it needs for itself.

Signed-off-by: Hugh Dickins <hughd@google.com>
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
include/linux/memcontrol.h
include/linux/shmem_fs.h
mm/memcontrol.c
mm/shmem.c