jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-29 21:52:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Do not set the uppervp to NULLVP in union_removed_upper. If lowervp

Browse Source 
is NULLVP, union node will have neither uppervp nor lowervp.  This
causes page fault trap.

The union_removed_upper just remove union node from cache and it
doesn't set uppervp to NULLVP.  Since union node is removed from
cache, it will not be referenced.

The code that remove union node from cache was copied from
union_inactive.
This commit is contained in:
KATO Takenori 1997-04-16 16:24:24 +00:00
parent 3cc273e0be
commit b69aa7f11a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=24985
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/fs/unionfs/union_subr.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)union_subr.c 8.20 (Berkeley) 5/20/95 * @(#)union_subr.c 8.20 (Berkeley) 5/20/95
* $Id: union_subr.c,v 1.16 1997/04/13 06:25:03 phk Exp $ * $Id: union_subr.c,v 1.17 1997/04/13 06:27:09 phk Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -971,8 +971,23 @@ union_removed_upper(un)
struct union_node *un; struct union_node *un;
{ {
struct proc *p = curproc; /* XXX */ struct proc *p = curproc; /* XXX */
struct vnode **vpp;
/*
* Do not set the uppervp to NULLVP. If lowervp is NULLVP,
* union node will have neither uppervp nor lowervp. We romove
* the union node from cache, so that it will not be referrenced.
*/
#if 0
union_newupper(un, NULLVP); union_newupper(un, NULLVP);
#endif
if (un->un_dircache != 0) {
for (vpp = un->un_dircache; *vpp != NULLVP; vpp++)
vrele(*vpp);
free(un->un_dircache, M_TEMP);
un->un_dircache = 0;
}
if (un->un_flags & UN_CACHED) { if (un->un_flags & UN_CACHED) {
un->un_flags &= ~UN_CACHED; un->un_flags &= ~UN_CACHED;
LIST_REMOVE(un, un_cache); LIST_REMOVE(un, un_cache);

17
sys/miscfs/union/union_subr.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)union_subr.c 8.20 (Berkeley) 5/20/95 * @(#)union_subr.c 8.20 (Berkeley) 5/20/95
* $Id: union_subr.c,v 1.16 1997/04/13 06:25:03 phk Exp $ * $Id: union_subr.c,v 1.17 1997/04/13 06:27:09 phk Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -971,8 +971,23 @@ union_removed_upper(un)
struct union_node *un; struct union_node *un;
{ {
struct proc *p = curproc; /* XXX */ struct proc *p = curproc; /* XXX */
struct vnode **vpp;
/*
* Do not set the uppervp to NULLVP. If lowervp is NULLVP,
* union node will have neither uppervp nor lowervp. We romove
* the union node from cache, so that it will not be referrenced.
*/
#if 0
union_newupper(un, NULLVP); union_newupper(un, NULLVP);
#endif
if (un->un_dircache != 0) {
for (vpp = un->un_dircache; *vpp != NULLVP; vpp++)
vrele(*vpp);
free(un->un_dircache, M_TEMP);
un->un_dircache = 0;
}
if (un->un_flags & UN_CACHED) { if (un->un_flags & UN_CACHED) {
un->un_flags &= ~UN_CACHED; un->un_flags &= ~UN_CACHED;
LIST_REMOVE(un, un_cache); LIST_REMOVE(un, un_cache);