Merge "scsi: ufs: Avoid dead lock during error recovery"