Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 6dbf6d3bb955d5a92005b6ecd6ffad2c5b95b963

Authored by Hugh Dickins
Committed by Linus Torvalds
1 parent 427d5416f3
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

memcg: page_cache_release not __free_page 

There's nothing wrong with mem_cgroup_charge failure in do_wp_page and
do_anonymous page using __free_page, but it does look odd when nearby code
uses page_cache_release: use that instead (while turning a blind eye to
ancient inconsistencies of page_cache_release versus put_page).

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: David Rientjes <rientjes@google.com>
Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hirokazu Takahashi <taka@valinux.co.jp>
Cc: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Cc: Paul Menage <menage@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -1711,7 +1711,7 @@
1711 1711 }
1712 1712 return ret;
1713 1713 oom_free_new:
1714   - __free_page(new_page);
  1714 + page_cache_release(new_page);
1715 1715 oom:
1716 1716 if (old_page)
1717 1717 page_cache_release(old_page);
... ... @@ -2163,7 +2163,7 @@
2163 2163 page_cache_release(page);
2164 2164 goto unlock;
2165 2165 oom_free_page:
2166   - __free_page(page);
  2166 + page_cache_release(page);
2167 2167 oom:
2168 2168 return VM_FAULT_OOM;
2169 2169 }