Merge "swap: add per-partition lock for swapfile"