memcg: revert fix to mapcount check for this release
authorHugh Dickins <hughd@google.com>
Fri, 9 Mar 2012 21:37:32 +0000 (13:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Mar 2012 23:32:20 +0000 (15:32 -0800)
commitbe22aece684f5a700e6247b9861c3759d5798a3c
tree07d423a2cdb16140e8704a69788f8b9bd5ddbe13
parenta7f4255f906f60f72e00aad2fb000939449ff32e
memcg: revert fix to mapcount check for this release

Respectfully revert commit e6ca7b89dc76 "memcg: fix mapcount check
in move charge code for anonymous page" for the 3.3 release, so that
it behaves exactly like releases 2.6.35 through 3.2 in this respect.

Horiguchi-san's commit is correct in itself, 1 makes much more sense
than 2 in that check; but it does not go far enough - swapcount
should be considered too - if we really want such a check at all.

We appear to have reached agreement now, and expect that 3.4 will
remove the mapcount check, but had better not make 3.3 different.

Signed-off-by: Hugh Dickins <hughd@google.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/memcontrol.c