diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1994-10-08 06:57:29 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1994-10-08 06:57:29 +0000 |
| commit | 0f954e5d09fcdf4d7753dbc0c7315f2d7cc93607 (patch) | |
| tree | b052bb50ffa6a013d919c68a25235f4df098267c /sys/gnu/ext2fs | |
| parent | 80fb3d79f6be945c4fbdfae84f12172de827407f (diff) | |
Notes
Diffstat (limited to 'sys/gnu/ext2fs')
| -rw-r--r-- | sys/gnu/ext2fs/ext2_bmap.c | 12 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/ext2_ihash.c | 8 |
2 files changed, 13 insertions, 7 deletions
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c index 6f38edc4d211..f3009bd30584 100644 --- a/sys/gnu/ext2fs/ext2_bmap.c +++ b/sys/gnu/ext2fs/ext2_bmap.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94 - * $Id$ + * $Id: ufs_bmap.c,v 1.3 1994/08/02 07:54:52 davidg Exp $ */ #include <sys/param.h> @@ -54,6 +54,8 @@ #include <ufs/ufs/ufsmount.h> #include <ufs/ufs/ufs_extern.h> +int ufs_bmaparray __P((struct vnode *, daddr_t, daddr_t *, struct indir *, int *, int *)); + /* * Bmap converts a the logical block number of a file to its physical block * number on the disk. The conversion is done by using the logical block @@ -137,7 +139,8 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp) xap = ap == NULL ? a : ap; if (!nump) nump = # - if (error = ufs_getlbns(vp, bn, xap, nump)) + error = ufs_getlbns(vp, bn, xap, nump); + if (error) return (error); num = *nump; @@ -165,7 +168,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp) */ metalbn = xap->in_lbn; - if (daddr == 0 && !incore(vp, metalbn) || metalbn == bn) + if ((daddr == 0 && !incore(vp, metalbn)) || metalbn == bn) break; /* * If we get here, we've either got the block in the cache @@ -189,7 +192,8 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp) bp->b_flags |= B_READ; VOP_STRATEGY(bp); curproc->p_stats->p_ru.ru_inblock++; /* XXX */ - if (error = biowait(bp)) { + error = biowait(bp); + if (error) { brelse(bp); return (error); } diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c index 45c1466a06e7..ce5b0f8d8e10 100644 --- a/sys/gnu/ext2fs/ext2_ihash.c +++ b/sys/gnu/ext2fs/ext2_ihash.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_ihash.c 8.4 (Berkeley) 12/30/93 - * $Id: ufs_ihash.c,v 1.2 1994/08/02 07:54:55 davidg Exp $ + * $Id: ufs_ihash.c,v 1.3 1994/10/06 21:07:01 davidg Exp $ */ #include <sys/param.h> @@ -122,7 +122,8 @@ ufs_ihashins(ip) struct inode **ipp, *iq; ipp = &ihashtbl[INOHASH(ip->i_dev, ip->i_number)]; - if (iq = *ipp) + iq = *ipp; + if (iq) iq->i_prev = &ip->i_next; ip->i_next = iq; ip->i_prev = ipp; @@ -145,7 +146,8 @@ ufs_ihashrem(ip) { register struct inode *iq; - if (iq = ip->i_next) + iq = ip->i_next; + if (iq) iq->i_prev = ip->i_prev; *ip->i_prev = iq; #ifdef DIAGNOSTIC |