Merge ../scsi-rc-fixes-2.6

This commit is contained in:
James Bottomley
2006-11-22 12:06:44 -06:00
1886 changed files with 57084 additions and 18671 deletions

View File

@@ -1177,7 +1177,10 @@ static int st_open(struct inode *inode, struct file *filp)
goto err_out;
if ((filp->f_flags & O_NONBLOCK) == 0 &&
retval != CHKRES_READY) {
retval = (-EIO);
if (STp->ready == NO_TAPE)
retval = (-ENOMEDIUM);
else
retval = (-EIO);
goto err_out;
}
return 0;