[PATCH] remove_from_swap: fix locking