mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-04 12:52:15 +00:00
Restored rev.1.31 which was clobbered by rev.1.69 (the big Lite2
merge). This fixes at least hanging in revoke(2) when a somewhat active slave pty is revoked. The hang made the window for the null pointer bug in ufsspec_{read,write} much larger. There are many other bugs in this area (revoke of an active fifo at best leaks memory...).
This commit is contained in:
parent
d26105a9ce
commit
4d94881342
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=42043
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
|
||||
* $Id: vfs_subr.c,v 1.175 1998/12/21 23:38:33 eivind Exp $
|
||||
* $Id: vfs_subr.c,v 1.176 1998/12/22 00:44:11 eivind Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -47,6 +47,7 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/malloc.h>
|
||||
@ -1583,7 +1584,7 @@ vclean(vp, flags, p)
|
||||
*/
|
||||
if (active) {
|
||||
if (flags & DOCLOSE)
|
||||
VOP_CLOSE(vp, IO_NDELAY, NOCRED, p);
|
||||
VOP_CLOSE(vp, FNONBLOCK, NOCRED, p);
|
||||
VOP_INACTIVE(vp, p);
|
||||
} else {
|
||||
/*
|
||||
|
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
|
||||
* $Id: vfs_subr.c,v 1.175 1998/12/21 23:38:33 eivind Exp $
|
||||
* $Id: vfs_subr.c,v 1.176 1998/12/22 00:44:11 eivind Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -47,6 +47,7 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/malloc.h>
|
||||
@ -1583,7 +1584,7 @@ vclean(vp, flags, p)
|
||||
*/
|
||||
if (active) {
|
||||
if (flags & DOCLOSE)
|
||||
VOP_CLOSE(vp, IO_NDELAY, NOCRED, p);
|
||||
VOP_CLOSE(vp, FNONBLOCK, NOCRED, p);
|
||||
VOP_INACTIVE(vp, p);
|
||||
} else {
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user