The scsi ones are already gone in jejb's tree, I'll post a patch
to kill the struct fields once the scsi tree and this patch end
up merged in mainline.