Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with ufs/ufs/ufs_bmap.c rev 1.14:

Browse Source 
- assert that ufs_getlbns() is only called for blocks which involve indirects
- use a shift instead of a multiply in one place
This commit is contained in:
lukem 2001-11-08 06:10:13 +00:00
parent 27cc5a5d37
commit 68b8babd26
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/makefs/ffs/ufs_bmap.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: ufs_bmap.c,v 1.2 2001/10/28 13:14:06 lukem Exp $ */ /* $NetBSD: ufs_bmap.c,v 1.3 2001/11/08 06:10:13 lukem Exp $ */
/* From: NetBSD: ufs_bmap.c,v 1.10 2000/11/27 08:39:57 chs Exp */ /* From: NetBSD: ufs_bmap.c,v 1.14 2001/11/08 05:00:51 chs Exp */
/* /*
* Copyright (c) 1989, 1991, 1993 * Copyright (c) 1989, 1991, 1993
@ -43,12 +43,13 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef __lint #ifndef __lint
__RCSID("$NetBSD: ufs_bmap.c,v 1.2 2001/10/28 13:14:06 lukem Exp $"); __RCSID("$NetBSD: ufs_bmap.c,v 1.3 2001/11/08 06:10:13 lukem Exp $");
#endif /* !__lint */ #endif /* !__lint */
#include <sys/param.h> #include <sys/param.h>
#include <sys/time.h> #include <sys/time.h>
#include <assert.h>
#include <errno.h> #include <errno.h>
#include <ufs/ufs/ufs_bswap.h> #include <ufs/ufs/ufs_bswap.h>
@ -84,9 +85,7 @@ ufs_getlbns(struct inode *ip, ufs_daddr_t bn, struct indir *ap, int *nump)
if ((long)bn < 0) if ((long)bn < 0)
bn = -(long)bn; bn = -(long)bn;
/* The first NDADDR blocks are direct blocks. */ assert (bn >= NDADDR);
if (bn < NDADDR)
return (0);
/* /*
* Determine the number of levels of indirection. After this loop * Determine the number of levels of indirection. After this loop
@ -138,7 +137,7 @@ ufs_getlbns(struct inode *ip, ufs_daddr_t bn, struct indir *ap, int *nump)
ap->in_exists = 0; ap->in_exists = 0;
++ap; ++ap;
metalbn -= -1 + off * blockcnt; metalbn -= -1 + (off << lbc);
} }
if (nump) if (nump)
*nump = numlevels; *nump = numlevels;