On Fri, Jul 13, 2018 at 07:36:36AM +0800, Huang, Ying wrote: > From: Huang Ying <ying.huang@xxxxxxxxx> > > In this patch, locking related code is shared between huge/normal code > path in put_swap_page() to reduce code duplication. And `free_entries > == 0` case is merged into more general `free_entries != > SWAPFILE_CLUSTER` case, because the new locking method makes it easy. Might be a bit easier to think about the two changes if they were split up. Agree with Dave's comment from patch 1, but otherwise the series looks ok to me. I like the nr_swap_entries macro, that's clever.