[PATCH v2 0/5] mm, swap: misc cleanup and bugfix