diff options
| author | rgrimes <rgrimes@FreeBSD.org> | 1994-05-25 09:21:21 +0000 |
|---|---|---|
| committer | rgrimes <rgrimes@FreeBSD.org> | 1994-05-25 09:21:21 +0000 |
| commit | 2469c867a164210ce96143517059f21db7f1fd17 (patch) | |
| tree | 9179427ac860211c445df663fd2b86267366bfba /sys/fs/unionfs/union_subr.c | |
| parent | cb0aba89af15a48e2655e898a503946ac4cb42ae (diff) | |
| download | FreeBSD-src-2469c867a164210ce96143517059f21db7f1fd17.zip FreeBSD-src-2469c867a164210ce96143517059f21db7f1fd17.tar.gz | |
The big 4.4BSD Lite to FreeBSD 2.0.0 (Development) patch.
Reviewed by: Rodney W. Grimes
Submitted by: John Dyson and David Greenman
Diffstat (limited to 'sys/fs/unionfs/union_subr.c')
| -rw-r--r-- | sys/fs/unionfs/union_subr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 77947d1..ea4f804 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -49,9 +49,7 @@ #include <sys/queue.h> #include <miscfs/union/union.h> -#ifdef DIAGNOSTIC #include <sys/proc.h> -#endif /* must be power of two, otherwise change UNION_HASH() */ #define NHASH 32 @@ -71,6 +69,7 @@ union_init() for (i = 0; i < NHASH; i++) LIST_INIT(&unhead[i]); bzero((caddr_t) unvplock, sizeof(unvplock)); + return (0); } static int @@ -223,10 +222,10 @@ union_allocvp(vpp, mp, undvp, dvp, cnp, uppervp, lowervp) struct vnode *lowervp; /* may be null */ { int error; - struct union_node *un; + struct union_node *un = 0; struct union_node **pp; struct vnode *xlowervp = NULLVP; - int hash; + int hash = 0; int try; if (uppervp == NULLVP && lowervp == NULLVP) |
