[SCSI] sd: fixes from upstream