MFC: rev 1.66

Don't allow ioctl commands to be interrupted by the user.

Approved by:	re (scottl)
This commit is contained in:
ps 2005-09-16 18:04:10 +00:00
parent 586b207d6c
commit 37a466b452

View File

@ -962,7 +962,7 @@ amr_bio_command(struct amr_softc *sc, struct amr_command **acp)
static int
amr_wait_command(struct amr_command *ac)
{
int error, count;
int error = 0;
debug_called(1);
@ -971,12 +971,10 @@ amr_wait_command(struct amr_command *ac)
if ((error = amr_start(ac)) != 0)
return(error);
count = 0;
/* XXX better timeout? */
while ((ac->ac_flags & AMR_CMD_BUSY) && (count < 30)) {
msleep(ac, &ac->ac_sc->amr_io_lock, PRIBIO | PCATCH, "amrwcmd", hz);
while ((ac->ac_flags & AMR_CMD_BUSY) && (error != EWOULDBLOCK)) {
error = msleep(ac, &ac->ac_sc->amr_io_lock, PRIBIO, "amrwcmd", 0);
}
return(0);
return(error);
}
/********************************************************************************