It's taken years to get here, but Mel finally got a series of patches into the kernel, including this one, which should prevent deadlocks of machines doing swap-over-NBD. This means that one of my longest-running wishlist items has finally been attended to.
Mel, I owe you a beer.
Update: Mel seems to think I don't owe him beer. Obviously he's wrong.