summaryrefslogtreecommitdiffstats
path: root/sys/miscfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/miscfs')
-rw-r--r--sys/miscfs/fdesc/fdesc_vnops.c3
-rw-r--r--sys/miscfs/fifofs/fifo_vnops.c44
-rw-r--r--sys/miscfs/kernfs/kernfs_vfsops.c8
-rw-r--r--sys/miscfs/kernfs/kernfs_vnops.c4
-rw-r--r--sys/miscfs/nullfs/null_subr.c18
5 files changed, 44 insertions, 33 deletions
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index b88f308..b73df0e 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94
*
- * $Id: fdesc_vnops.c,v 1.4 1994/09/09 13:24:26 davidg Exp $
+ * $Id: fdesc_vnops.c,v 1.5 1994/09/21 03:46:56 wollman Exp $
*/
/*
@@ -58,6 +58,7 @@
#include <sys/namei.h>
#include <sys/buf.h>
#include <sys/dirent.h>
+#include <sys/socketvar.h>
#include <miscfs/fdesc/fdesc.h>
#define cttyvp(p) ((p)->p_flag & P_CONTROLT ? (p)->p_session->s_ttyvp : NULL)
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index d27cbe1..bd250de 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.4 1994/09/21 03:46:57 wollman Exp $
+ * $Id: fifo_vnops.c,v 1.5 1994/09/22 19:38:07 wollman Exp $
*/
#include <sys/param.h>
@@ -153,20 +153,23 @@ fifo_open(ap)
if ((fip = vp->v_fifoinfo) == NULL) {
MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, M_WAITOK);
vp->v_fifoinfo = fip;
- if (error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0)) {
+ error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0);
+ if (error) {
free(fip, M_VNODE);
vp->v_fifoinfo = NULL;
return (error);
}
fip->fi_readsock = rso;
- if (error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0)) {
+ error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0);
+ if (error) {
(void)soclose(rso);
free(fip, M_VNODE);
vp->v_fifoinfo = NULL;
return (error);
}
fip->fi_writesock = wso;
- if (error = unp_connect2(wso, rso)) {
+ error = unp_connect2(wso, rso);
+ if (error) {
(void)soclose(wso);
(void)soclose(rso);
free(fip, M_VNODE);
@@ -247,8 +250,8 @@ fifo_read(ap)
rso->so_state |= SS_NBIO;
startresid = uio->uio_resid;
VOP_UNLOCK(ap->a_vp);
- error = soreceive(rso, (struct mbuf **)0, uio, (int *)0,
- (struct mbuf **)0, (struct mbuf **)0);
+ error = soreceive(rso, (struct mbuf **)0, uio,
+ (struct mbuf **)0, (struct mbuf **)0, (int*)0);
VOP_LOCK(ap->a_vp);
/*
* Clear EOF indication after first such return.
@@ -418,33 +421,34 @@ fifo_close(ap)
return (error2);
}
+
/*
- * Print out the contents of a fifo vnode.
+ * Print out internal contents of a fifo vnode.
*/
int
-fifo_print(ap)
- struct vop_print_args /* {
- struct vnode *a_vp;
- } */ *ap;
+fifo_printinfo(vp)
+ struct vnode *vp;
{
+ register struct fifoinfo *fip = vp->v_fifoinfo;
- printf("tag VT_NON");
- fifo_printinfo(ap->a_vp);
- printf("\n");
+ printf(", fifo with %ld readers and %ld writers",
+ fip->fi_readers, fip->fi_writers);
return (0);
}
/*
- * Print out internal contents of a fifo vnode.
+ * Print out the contents of a fifo vnode.
*/
int
-fifo_printinfo(vp)
- struct vnode *vp;
+fifo_print(ap)
+ struct vop_print_args /* {
+ struct vnode *a_vp;
+ } */ *ap;
{
- register struct fifoinfo *fip = vp->v_fifoinfo;
- printf(", fifo with %d readers and %d writers",
- fip->fi_readers, fip->fi_writers);
+ printf("tag VT_NON");
+ fifo_printinfo(ap->a_vp);
+ printf("\n");
return (0);
}
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index fe1341b..eee76e7 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)kernfs_vfsops.c 8.4 (Berkeley) 1/21/94
- * $Id: kernfs_vfsops.c,v 1.4 1994/09/21 03:46:59 wollman Exp $
+ * $Id: kernfs_vfsops.c,v 1.5 1994/09/22 19:38:11 wollman Exp $
*/
/*
@@ -78,7 +78,8 @@ cdevvp(dev, vpp)
}
vp = nvp;
vp->v_type = VCHR;
- if (nvp = checkalias(vp, dev, (struct mount *)0)) {
+ nvp = checkalias(vp, dev, (struct mount *)0);
+ if (nvp) {
vput(vp);
vp = nvp;
}
@@ -206,7 +207,8 @@ kernfs_unmount(mp, mntflags, p)
#ifdef KERNFS_DIAGNOSTIC
printf("kernfs_unmount: calling vflush\n");
#endif
- if (error = vflush(mp, rootvp, flags))
+ error = vflush(mp, rootvp, flags);
+ if (error)
return (error);
#ifdef KERNFS_DIAGNOSTIC
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index b287bb3..a4b6d4d 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)kernfs_vnops.c 8.6 (Berkeley) 2/10/94
- * $Id: kernfs_vnops.c,v 1.4 1994/08/18 22:35:12 wollman Exp $
+ * $Id: kernfs_vnops.c,v 1.5 1994/09/21 03:47:00 wollman Exp $
*/
/*
@@ -111,7 +111,7 @@ kernfs_xread(kt, buf, len, lenp)
case KTT_TIME: {
struct timeval tv;
microtime(&tv);
- sprintf(buf, "%d %d\n", tv.tv_sec, tv.tv_usec);
+ sprintf(buf, "%ld %ld\n", tv.tv_sec, tv.tv_usec);
break;
}
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index 5541fb3..8d18ffd 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -35,7 +35,7 @@
*
* @(#)null_subr.c 8.4 (Berkeley) 1/21/94
*
- * $Id: lofs_subr.c,v 1.11 1992/05/30 10:05:43 jsp Exp jsp $
+ * $Id: null_subr.c,v 1.2 1994/05/25 09:08:00 rgrimes Exp $
*/
#include <sys/param.h>
@@ -153,7 +153,8 @@ null_node_alloc(mp, lowervp, vpp)
struct vnode *othervp, *vp;
int error;
- if (error = getnewvnode(VT_NULL, mp, null_vnodeop_p, vpp))
+ error = getnewvnode(VT_NULL, mp, null_vnodeop_p, vpp);
+ if (error)
return (error);
vp = *vpp;
@@ -167,7 +168,8 @@ null_node_alloc(mp, lowervp, vpp)
* check to see if someone else has beaten us to it.
* (We could have slept in MALLOC.)
*/
- if (othervp = null_node_find(lowervp)) {
+ othervp = null_node_find(lowervp);
+ if (othervp) {
FREE(xp, M_TEMP);
vp->v_type = VBAD; /* node is discarded */
vp->v_usecount = 0; /* XXX */
@@ -194,7 +196,8 @@ null_node_create(mp, lowervp, newvpp)
{
struct vnode *aliasvp;
- if (aliasvp = null_node_find(mp, lowervp)) {
+ aliasvp = null_node_find(mp, lowervp);
+ if (aliasvp) {
/*
* null_node_find has taken another reference
* to the alias vnode.
@@ -216,7 +219,8 @@ null_node_create(mp, lowervp, newvpp)
/*
* Make new vnode reference the null_node.
*/
- if (error = null_node_alloc(mp, lowervp, &aliasvp))
+ error = null_node_alloc(mp, lowervp, &aliasvp);
+ if (error)
return error;
/*
@@ -229,8 +233,8 @@ null_node_create(mp, lowervp, newvpp)
#ifdef DIAGNOSTIC
if (lowervp->v_usecount < 1) {
/* Should never happen... */
- vprint ("null_node_create: alias ");
- vprint ("null_node_create: lower ");
+ vprint ("null_node_create: alias ",aliasvp);
+ vprint ("null_node_create: lower ",lowervp);
printf ("null_node_create: lower has 0 usecount.\n");
panic ("null_node_create: lower has 0 usecount.");
};
OpenPOWER on IntegriCloud