swiotlb regression fixe

[Christoph Hellwig]

Hi all,

attached are a bunch of fixes for regressions in the recent swiotlb
refactoring.  The first one was reported by Conor, and the other two
are things I found by code inspections while trying to fix what he
reported.