jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 12:28:58 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Prevent media eject on first open and re-enable ejection on last close.

Browse Source 
The previous behavior was based on the lifetime of a "mount session"
which isn't very obvious.
This commit is contained in:
Justin T. Gibbs 1996-01-29 03:19:23 +00:00
parent 0fed413e64
commit 299bb9dbd6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=13696
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/scsi/st.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct * on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances. * functioning of this software in any circumstances.
* *
* $Id: st.c,v 1.57 1996/01/08 12:25:06 joerg Exp $ * $Id: st.c,v 1.58 1996/01/14 16:29:01 joerg Exp $
*/ */
/* /*
@ -519,6 +519,8 @@ struct scsi_link *sc_link)
if ((flags & O_ACCMODE) == FWRITE) if ((flags & O_ACCMODE) == FWRITE)
st->flags |= ST_WRITTEN; st->flags |= ST_WRITTEN;
scsi_prevent(sc_link, PR_PREVENT, 0); /* who cares if it fails? */
SC_DEBUG(sc_link, SDEV_DB2, ("Open complete\n")); SC_DEBUG(sc_link, SDEV_DB2, ("Open complete\n"));
st->flags |= ST_OPEN; st->flags |= ST_OPEN;
@ -556,8 +558,11 @@ st_close(dev_t dev, int flag, int fmt, struct proc *p,
st_unmount(unit, EJECT); st_unmount(unit, EJECT);
break; break;
} }
scsi_prevent(sc_link, PR_ALLOW, SCSI_SILENT);
sc_link->flags &= ~SDEV_OPEN; sc_link->flags &= ~SDEV_OPEN;
st->flags &= ~ST_OPEN; st->flags &= ~ST_OPEN;
return (0); return (0);
} }
@ -657,7 +662,6 @@ st_mount_tape(dev, flags)
printf("st%ld: Cannot set selected mode", unit); printf("st%ld: Cannot set selected mode", unit);
return errno; return errno;
} }
scsi_prevent(sc_link, PR_PREVENT, 0); /* who cares if it fails? */
st->flags &= ~ST_NEW_MOUNT; st->flags &= ~ST_NEW_MOUNT;
st->flags |= ST_MOUNTED; st->flags |= ST_MOUNTED;
sc_link->flags |= SDEV_MEDIA_LOADED; sc_link->flags |= SDEV_MEDIA_LOADED;
@ -683,7 +687,6 @@ st_unmount(int unit, boolean eject)
SC_DEBUG(sc_link, SDEV_DB1, ("unmounting\n")); SC_DEBUG(sc_link, SDEV_DB1, ("unmounting\n"));
st_chkeod(unit, FALSE, &nmarks, SCSI_SILENT); st_chkeod(unit, FALSE, &nmarks, SCSI_SILENT);
st_rewind(unit, FALSE, SCSI_SILENT); st_rewind(unit, FALSE, SCSI_SILENT);
scsi_prevent(sc_link, PR_ALLOW, SCSI_SILENT);
if (eject) { if (eject) {
st_load(unit, LD_UNLOAD, SCSI_SILENT); st_load(unit, LD_UNLOAD, SCSI_SILENT);
} }