On Fri, Oct 12, 2018 at 01:59:34PM -0700, Andrew Morton wrote: > On Tue, 11 Sep 2018 15:34:44 -0700 Omar Sandoval <osandov@xxxxxxxxxxx> wrote: > > > From: Omar Sandoval <osandov@xxxxxx> > > > > The SWP_FILE flag serves two purposes: to make swap_{read,write}page() > > go through the filesystem, and to make swapoff() call > > ->swap_deactivate(). For Btrfs, we want the latter but not the former, > > so split this flag into two. This makes us always call > > ->swap_deactivate() if ->swap_activate() succeeded, not just if it > > didn't add any swap extents itself. > > > > This also resolves the issue of the very misleading name of SWP_FILE, > > which is only used for swap files over NFS. > > > > Acked-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Andrew, can you please take the two patches through the mm tree? I'm not going to send the btrfs swap patches in the upcoming merge window so it would not make sense to add plain MM changes to btrfs tree. The whole series has been in linux-next for some time so it's just moving between trees. Thanks.