summaryrefslogtreecommitdiff
path: root/sys/ufs/ffs/ffs_subr.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-02-27 07:27:42 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-02-27 07:27:42 +0000
commite1d50524a19b291d7ddb25c7d05b8086df55b1c0 (patch)
tree6b1fba1880af780494d2e8df73cabcf9d30b36c6 /sys/ufs/ffs/ffs_subr.c
parent6fbea858373322940c41a040e3a5dce6edf08661 (diff)
From NetBSD: update to 960217 sources
Diffstat (limited to 'sys/ufs/ffs/ffs_subr.c')
-rw-r--r--sys/ufs/ffs/ffs_subr.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index ab971d75712..b532f86d4af 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -1,4 +1,5 @@
-/* $NetBSD: ffs_subr.c,v 1.4 1995/03/28 20:01:44 jtc Exp $ */
+/* $OpenBSD: ffs_subr.c,v 1.2 1996/02/27 07:27:39 niklas Exp $ */
+/* $NetBSD: ffs_subr.c,v 1.5 1996/02/09 22:22:24 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -52,14 +53,15 @@
* remaining space in the directory.
*/
int
-ffs_blkatoff(ap)
+ffs_blkatoff(v)
+ void *v;
+{
struct vop_blkatoff_args /* {
struct vnode *a_vp;
off_t a_offset;
char **a_res;
struct buf **a_bpp;
- } */ *ap;
-{
+ } */ *ap = v;
struct inode *ip;
register struct fs *fs;
struct buf *bp;
@@ -72,7 +74,7 @@ ffs_blkatoff(ap)
bsize = blksize(fs, ip, lbn);
*ap->a_bpp = NULL;
- if (error = bread(ap->a_vp, lbn, bsize, NOCRED, &bp)) {
+ if ((error = bread(ap->a_vp, lbn, bsize, NOCRED, &bp)) != 0) {
brelse(bp);
return (error);
}