null_node_find() and umap_node_find() were sometimes called without a
`struct mount *' arg. I don't know what the effects of this were.
This commit is contained in:
parent
3ffece8c26
commit
2e52c1f9e5
@ -35,7 +35,7 @@
|
|||||||
*
|
*
|
||||||
* @(#)null_subr.c 8.4 (Berkeley) 1/21/94
|
* @(#)null_subr.c 8.4 (Berkeley) 1/21/94
|
||||||
*
|
*
|
||||||
* $Id: null_subr.c,v 1.2 1994/05/25 09:08:00 rgrimes Exp $
|
* $Id: null_subr.c,v 1.3 1994/10/02 17:48:14 phk Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -168,7 +168,7 @@ null_node_alloc(mp, lowervp, vpp)
|
|||||||
* check to see if someone else has beaten us to it.
|
* check to see if someone else has beaten us to it.
|
||||||
* (We could have slept in MALLOC.)
|
* (We could have slept in MALLOC.)
|
||||||
*/
|
*/
|
||||||
othervp = null_node_find(lowervp);
|
othervp = null_node_find(mp, lowervp);
|
||||||
if (othervp) {
|
if (othervp) {
|
||||||
FREE(xp, M_TEMP);
|
FREE(xp, M_TEMP);
|
||||||
vp->v_type = VBAD; /* node is discarded */
|
vp->v_type = VBAD; /* node is discarded */
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
*
|
*
|
||||||
* @(#)umap_subr.c 8.6 (Berkeley) 1/26/94
|
* @(#)umap_subr.c 8.6 (Berkeley) 1/26/94
|
||||||
*
|
*
|
||||||
* $Id: umap_subr.c,v 1.3 1994/10/10 07:55:43 phk Exp $
|
* $Id: umap_subr.c,v 1.4 1995/05/30 08:07:17 rgrimes Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -228,7 +228,7 @@ umap_node_alloc(mp, lowervp, vpp)
|
|||||||
* check to see if someone else has beaten us to it.
|
* check to see if someone else has beaten us to it.
|
||||||
* (We could have slept in MALLOC.)
|
* (We could have slept in MALLOC.)
|
||||||
*/
|
*/
|
||||||
othervp = umap_node_find(lowervp);
|
othervp = umap_node_find(mp, lowervp);
|
||||||
if (othervp) {
|
if (othervp) {
|
||||||
FREE(xp, M_TEMP);
|
FREE(xp, M_TEMP);
|
||||||
vp->v_type = VBAD; /* node is discarded */
|
vp->v_type = VBAD; /* node is discarded */
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
*
|
*
|
||||||
* @(#)null_subr.c 8.4 (Berkeley) 1/21/94
|
* @(#)null_subr.c 8.4 (Berkeley) 1/21/94
|
||||||
*
|
*
|
||||||
* $Id: null_subr.c,v 1.2 1994/05/25 09:08:00 rgrimes Exp $
|
* $Id: null_subr.c,v 1.3 1994/10/02 17:48:14 phk Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -168,7 +168,7 @@ null_node_alloc(mp, lowervp, vpp)
|
|||||||
* check to see if someone else has beaten us to it.
|
* check to see if someone else has beaten us to it.
|
||||||
* (We could have slept in MALLOC.)
|
* (We could have slept in MALLOC.)
|
||||||
*/
|
*/
|
||||||
othervp = null_node_find(lowervp);
|
othervp = null_node_find(mp, lowervp);
|
||||||
if (othervp) {
|
if (othervp) {
|
||||||
FREE(xp, M_TEMP);
|
FREE(xp, M_TEMP);
|
||||||
vp->v_type = VBAD; /* node is discarded */
|
vp->v_type = VBAD; /* node is discarded */
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
*
|
*
|
||||||
* @(#)umap_subr.c 8.6 (Berkeley) 1/26/94
|
* @(#)umap_subr.c 8.6 (Berkeley) 1/26/94
|
||||||
*
|
*
|
||||||
* $Id: umap_subr.c,v 1.3 1994/10/10 07:55:43 phk Exp $
|
* $Id: umap_subr.c,v 1.4 1995/05/30 08:07:17 rgrimes Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -228,7 +228,7 @@ umap_node_alloc(mp, lowervp, vpp)
|
|||||||
* check to see if someone else has beaten us to it.
|
* check to see if someone else has beaten us to it.
|
||||||
* (We could have slept in MALLOC.)
|
* (We could have slept in MALLOC.)
|
||||||
*/
|
*/
|
||||||
othervp = umap_node_find(lowervp);
|
othervp = umap_node_find(mp, lowervp);
|
||||||
if (othervp) {
|
if (othervp) {
|
||||||
FREE(xp, M_TEMP);
|
FREE(xp, M_TEMP);
|
||||||
vp->v_type = VBAD; /* node is discarded */
|
vp->v_type = VBAD; /* node is discarded */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user