fix swapon for recently unshared blocks v2

[Christoph Hellwig <hch@xxxxxx>]

Hi all,

the first patch fixes the recently added generic/370, and the
second one does a bit of naming cleanup in the area.

Changes since v1:
 - expand the comment based on text from Dave Chinner
 - add a Fixes tag