aboutsummaryrefslogtreecommitdiff
path: root/sys/fs/nullfs
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1994-10-10 07:55:48 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1994-10-10 07:55:48 +0000
commit3a773ad0b564e224a380b188f005e6582fabaf34 (patch)
tree7554aaa733a10acfa4773a846448e6f66d2d6ee3 /sys/fs/nullfs
parent76d121f2b4327918e0b80ce497282fa435820771 (diff)
downloadsrc-3a773ad0b564e224a380b188f005e6582fabaf34.tar.gz
src-3a773ad0b564e224a380b188f005e6582fabaf34.zip
Cosmetics. reduce the noise from gcc -Wall.
Notes
Notes: svn path=/head/; revision=3496
Diffstat (limited to 'sys/fs/nullfs')
-rw-r--r--sys/fs/nullfs/null_vfsops.c11
-rw-r--r--sys/fs/nullfs/null_vnops.c7
2 files changed, 11 insertions, 7 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 8ffdcb477f08..4e13fb28e578 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
* @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94
*
* @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.2 1994/09/21 03:47:01 wollman Exp $
+ * $Id: null_vfsops.c,v 1.3 1994/09/22 19:38:14 wollman Exp $
*/
/*
@@ -88,7 +88,8 @@ nullfs_mount(mp, path, data, ndp, p)
/*
* Get argument
*/
- if (error = copyin(data, (caddr_t)&args, sizeof(struct null_args)))
+ error = copyin(data, (caddr_t)&args, sizeof(struct null_args));
+ if (error)
return (error);
/*
@@ -96,7 +97,8 @@ nullfs_mount(mp, path, data, ndp, p)
*/
NDINIT(ndp, LOOKUP, FOLLOW|WANTPARENT|LOCKLEAF,
UIO_USERSPACE, args.target, p);
- if (error = namei(ndp))
+ error = namei(ndp);
+ if (error)
return (error);
/*
@@ -209,7 +211,8 @@ nullfs_unmount(mp, mntflags, p)
#endif
if (nullm_rootvp->v_usecount > 1)
return (EBUSY);
- if (error = vflush(mp, nullm_rootvp, flags))
+ error = vflush(mp, nullm_rootvp, flags);
+ if (error)
return (error);
#ifdef NULLFS_DIAGNOSTIC
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 78feac260d3c..4f51452fe619 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)null_vnops.c 8.1 (Berkeley) 6/10/93
*
- * $Id: null_vnops.c,v 1.4 1994/09/21 03:47:02 wollman Exp $
+ * $Id: null_vnops.c,v 1.5 1994/09/21 23:22:41 wollman Exp $
*/
/*
@@ -321,7 +321,8 @@ null_getattr(ap)
} */ *ap;
{
int error;
- if (error = null_bypass(ap))
+ error = null_bypass(ap);
+ if (error)
return (error);
/* Requires that arguments be restored. */
ap->a_vap->va_fsid = ap->a_vp->v_mount->mnt_stat.f_fsid.val[0];
@@ -381,7 +382,7 @@ null_print(ap)
} */ *ap;
{
register struct vnode *vp = ap->a_vp;
- printf ("\ttag VT_NULLFS, vp=%x, lowervp=%x\n", vp, NULLVPTOLOWERVP(vp));
+ printf ("\ttag VT_NULLFS, vp=%p, lowervp=%p\n", vp, NULLVPTOLOWERVP(vp));
return (0);
}