aboutsummaryrefslogtreecommitdiff
path: root/sys/nfs/nfs_serv.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/nfs/nfs_serv.c')
-rw-r--r--sys/nfs/nfs_serv.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 2c80798e0b84..6205a268448e 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* From: @(#)nfs_serv.c 7.40 (Berkeley) 5/15/91
- * $Id: nfs_serv.c,v 1.3 1993/09/09 22:06:03 rgrimes Exp $
+ * $Id: nfs_serv.c,v 1.5 1993/12/19 00:54:12 wollman Exp $
*/
/*
@@ -72,6 +72,7 @@
#include "nfs.h"
#include "xdr_subs.h"
#include "nfsm_subs.h"
+#include "nfsnode.h"
/* Defs */
#define TRUE 1
@@ -270,7 +271,7 @@ nfsrv_readlink(mrep, md, dpos, cred, xid, mrq, repstat, p)
caddr_t bpos;
int error = 0;
char *cp2;
- struct mbuf *mb, *mb2, *mp2, *mp3, *mreq;
+ struct mbuf *mb, *mb2, *mp2 = 0, *mp3 = 0, *mreq;
struct vnode *vp;
nfsv2fh_t nfh;
fhandle_t *fhp;
@@ -356,7 +357,7 @@ nfsrv_read(mrep, md, dpos, cred, xid, mrq, repstat, p)
int error = 0;
char *cp2;
struct mbuf *mb, *mb2, *mreq;
- struct mbuf *m2, *m3;
+ struct mbuf *m2 = 0, *m3;
struct vnode *vp;
nfsv2fh_t nfh;
fhandle_t *fhp;
@@ -616,7 +617,7 @@ nfsrv_create(mrep, md, dpos, cred, xid, mrq, repstat, p)
FREE(nd.ni_pnbuf, M_NAMEI);
} else if (vap->va_type == VCHR || vap->va_type == VBLK ||
vap->va_type == VFIFO) {
- if (vap->va_type == VCHR && rdev == 0xffffffff)
+ if (vap->va_type == VCHR && rdev == 0xffffffffUL)
vap->va_type = VFIFO;
if (vap->va_type == VFIFO) {
#ifndef FIFO
@@ -781,7 +782,7 @@ nfsrv_rename(mrep, md, dpos, cred, xid, mrq, repstat, p)
char *cp2;
struct mbuf *mb, *mreq;
struct nameidata fromnd, tond;
- struct vnode *fvp, *tvp, *tdvp;
+ struct vnode *fvp = 0, *tvp, *tdvp;
nfsv2fh_t fnfh, tnfh;
fhandle_t *ffhp, *tfhp;
long len, len2;
@@ -1204,7 +1205,7 @@ nfsrv_readdir(mrep, md, dpos, cred, xid, mrq, repstat, p)
struct proc *p;
{
register char *bp, *be;
- register struct mbuf *mp;
+ register struct mbuf *mp = 0;
register struct direct *dp;
register caddr_t cp;
register u_long *tl;
@@ -1216,7 +1217,7 @@ nfsrv_readdir(mrep, md, dpos, cred, xid, mrq, repstat, p)
char *cpos, *cend;
int len, nlen, rem, xfer, tsiz, i;
struct vnode *vp;
- struct mbuf *mp2, *mp3;
+ struct mbuf *mp2 = 0, *mp3;
nfsv2fh_t nfh;
fhandle_t *fhp;
struct uio io;