two more nvme fixes for Linux 4.15

[Christoph Hellwig]

Hi Jens,

below are the two fixes for the new SGL support in 4.15 as a patch
series due to the issues with the git server.