]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
sys_swapon: call swap_cgroup_swapon() earlier
authorCesar Eduardo Barros <cesarb@cesarb.net>
Tue, 22 Mar 2011 23:33:31 +0000 (16:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Mar 2011 00:44:08 +0000 (17:44 -0700)
commit1421ef3cd15b87ef949e965efeb1e527479d3f75
tree8bcc6d1047905b205a7061c00bda40197fad2328
parent38719025384cf7121331bd6d41c062d3c5f7bb91
sys_swapon: call swap_cgroup_swapon() earlier

The call to swap_cgroup_swapon is in the middle of loading the swap map
and extents. As it only does memory allocation and does not depend on
the swapfile layout (map/extents), it can be called earlier (or later).

Move it to just after the allocation of swap_map, since it is
conceptually similar (allocates a map).

Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
Tested-by: Eric B Munson <emunson@mgebm.net>
Acked-by: Eric B Munson <emunson@mgebm.net>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/swapfile.c