diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-06-12 21:09:37 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-06-12 21:09:37 +0000 |
| commit | b25c178708f9322597967bdc138ac77e086de635 (patch) | |
| tree | 5b66394583c738b02b4fc2de13aa7a30f6e0b1bc /sys/ufs/ext2fs/ext2fs_bmap.c | |
| parent | 1ba981eaf39f2dcae6407bf6cc59361bb0de5195 (diff) | |
Sync with NetBSD, mostly cosmetic.
Diffstat (limited to 'sys/ufs/ext2fs/ext2fs_bmap.c')
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_bmap.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_bmap.c b/sys/ufs/ext2fs/ext2fs_bmap.c index 942ac9b3165..d64eddf39d6 100644 --- a/sys/ufs/ext2fs/ext2fs_bmap.c +++ b/sys/ufs/ext2fs/ext2fs_bmap.c @@ -1,9 +1,8 @@ -/* $OpenBSD: ext2fs_bmap.c,v 1.2 1997/05/30 08:33:42 downsj Exp $ */ -/* $NetBSD: ufs_bmap.c,v 1.3 1996/02/09 22:36:00 christos Exp $ */ - -/* Modified for EXT2FS on NetBSD by Manuel Bouyer, April 1997 */ +/* $OpenBSD: ext2fs_bmap.c,v 1.3 1997/06/12 21:09:31 downsj Exp $ */ +/* $NetBSD: ext2fs_bmap.c,v 1.1 1997/06/11 09:33:46 bouyer Exp $ */ /* + * Copyright (c) 1997 Manuel Bouyer. * Copyright (c) 1989, 1991, 1993 * The Regents of the University of California. All rights reserved. * (c) UNIX System Laboratories, Inc. @@ -41,6 +40,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94 + * Modified for ext2fs by Manuel Bouyer. */ #include <sys/param.h> @@ -89,7 +89,7 @@ ext2fs_bmap(v) return (0); return (ext2fs_bmaparray(ap->a_vp, ap->a_bn, ap->a_bnp, NULL, NULL, - ap->a_runp)); + ap->a_runp)); } /* @@ -157,9 +157,9 @@ ext2fs_bmaparray(vp, bn, bnp, ap, nump, runp) *bnp = -1; else if (runp) for (++bn; bn < NDADDR && *runp < maxrun && - is_sequential(ump, ip->i_e2fs_blocks[bn - 1], + is_sequential(ump, ip->i_e2fs_blocks[bn - 1], ip->i_e2fs_blocks[bn]); - ++bn, ++*runp); + ++bn, ++*runp); return (0); } @@ -209,10 +209,10 @@ ext2fs_bmaparray(vp, bn, bnp, ap, nump, runp) daddr = ((daddr_t *)bp->b_data)[xap->in_off]; if (num == 1 && daddr && runp) for (bn = xap->in_off + 1; - bn < MNINDIR(ump) && *runp < maxrun && - is_sequential(ump, ((daddr_t *)bp->b_data)[bn - 1], - ((daddr_t *)bp->b_data)[bn]); - ++bn, ++*runp); + bn < MNINDIR(ump) && *runp < maxrun && + is_sequential(ump, ((daddr_t *)bp->b_data)[bn - 1], + ((daddr_t *)bp->b_data)[bn]); + ++bn, ++*runp); } if (bp) brelse(bp); |