The call to frontswap_init() was added in a place where it is called not only from sys_swapon, but also from sys_swapoff. This pair of patches fixes that.
The first patch moves the acquisition of swap_lock from enable_swap_info to two separate helpers, one for sys_swapon and one for sys_swapoff. As a bonus, it also makes the code for sys_swapoff less subtle. The second patch moves the call to frontswap_init() from the common code to the helper used only by sys_swapon. Compile-tested only, but should be safe. Cesar Eduardo Barros (2): mm: refactor reinsert of swap_info in sys_swapoff mm: do not call frontswap_init() during swapoff mm/swapfile.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/