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

- log2() -> lfs_log2().

Browse Source 
- fix a couple of entries in struct lfs lfs_default:
	- in a comment, it's called dlfs_freehd now
	- dlfs_inodefmt comes after dlfs_tstamp.  fortunately for this
	one, LFS_44INODEFMT is also 0 so the right thing was happening.
This commit is contained in:
mrg 2006-05-11 16:56:50 +00:00
parent 77c7eed08d
commit d2eb498e2b
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/newfs_lfs/extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.9 2006/05/04 04:39:15 perseant Exp $ */ /* $NetBSD: extern.h,v 1.10 2006/05/11 16:56:50 mrg Exp $ */
/*- /*-
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -38,7 +38,7 @@ u_long cksum(void *, size_t);
u_short dkcksum(struct disklabel *); u_short dkcksum(struct disklabel *);
void fatal(const char *fmt, ...) void fatal(const char *fmt, ...)
__attribute__((__format__(__printf__,1,2))); __attribute__((__format__(__printf__,1,2)));
u_int log2(u_int); u_int lfs_log2(u_int);
int make_lfs(int, uint, struct partition *, int, int make_lfs(int, uint, struct partition *, int,
int, int, int, int, int, int, daddr_t, int, int, u_int32_t); int, int, int, int, int, int, daddr_t, int, int, u_int32_t);

22
sbin/newfs_lfs/make_lfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: make_lfs.c,v 1.7 2006/05/04 04:39:15 perseant Exp $ */ /* $NetBSD: make_lfs.c,v 1.8 2006/05/11 16:56:50 mrg Exp $ */
/*- /*-
* Copyright (c) 2003 The NetBSD Foundation, Inc. * Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -69,7 +69,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95"; static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95";
#else #else
__RCSID("$NetBSD: make_lfs.c,v 1.7 2006/05/04 04:39:15 perseant Exp $"); __RCSID("$NetBSD: make_lfs.c,v 1.8 2006/05/11 16:56:50 mrg Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -129,7 +129,7 @@ static struct lfs lfs_default = {
/* dlfs_bsize */ DFL_LFSBLOCK, /* dlfs_bsize */ DFL_LFSBLOCK,
/* dlfs_fsize */ DFL_LFSFRAG, /* dlfs_fsize */ DFL_LFSFRAG,
/* dlfs_frag */ DFL_LFSBLOCK/DFL_LFSFRAG, /* dlfs_frag */ DFL_LFSBLOCK/DFL_LFSFRAG,
/* dlfs_free */ HIGHEST_USED_INO + 1, /* dlfs_freehd */ HIGHEST_USED_INO + 1,
/* dlfs_bfree */ 0, /* dlfs_bfree */ 0,
/* dlfs_nfiles */ 0, /* dlfs_nfiles */ 0,
/* dlfs_avail */ 0, /* dlfs_avail */ 0,
@ -175,8 +175,8 @@ static struct lfs lfs_default = {
/* dlfs_serial */ 0, /* dlfs_serial */ 0,
/* dlfs_ibsize */ DFL_LFSFRAG, /* dlfs_ibsize */ DFL_LFSFRAG,
/* dlfs_start */ 0, /* dlfs_start */ 0,
/* dlfs_inodefmt */ LFS_44INODEFMT,
/* dlfs_tstamp */ 0, /* dlfs_tstamp */ 0,
/* dlfs_inodefmt */ LFS_44INODEFMT,
/* dlfs_interleave */ 0, /* dlfs_interleave */ 0,
/* dlfs_ident */ 0, /* dlfs_ident */ 0,
/* dlfs_fsbtodb */ 0, /* dlfs_fsbtodb */ 0,
@ -423,19 +423,19 @@ make_lfs(int devfd, uint secsize, struct partition *partp, int minfree,
tryagain: tryagain:
/* Modify parts of superblock overridden by command line arguments */ /* Modify parts of superblock overridden by command line arguments */
if (bsize != DFL_LFSBLOCK || fsize != DFL_LFSFRAG) { if (bsize != DFL_LFSBLOCK || fsize != DFL_LFSFRAG) {
fs->lfs_bshift = log2(bsize); fs->lfs_bshift = lfs_log2(bsize);
if (1 << fs->lfs_bshift != bsize) if (1 << fs->lfs_bshift != bsize)
fatal("%d: block size not a power of 2", bsize); fatal("%d: block size not a power of 2", bsize);
fs->lfs_bsize = bsize; fs->lfs_bsize = bsize;
fs->lfs_fsize = fsize; fs->lfs_fsize = fsize;
fs->lfs_bmask = bsize - 1; fs->lfs_bmask = bsize - 1;
fs->lfs_ffmask = fsize - 1; fs->lfs_ffmask = fsize - 1;
fs->lfs_ffshift = log2(fsize); fs->lfs_ffshift = lfs_log2(fsize);
if (1 << fs->lfs_ffshift != fsize) if (1 << fs->lfs_ffshift != fsize)
fatal("%d: frag size not a power of 2", fsize); fatal("%d: frag size not a power of 2", fsize);
fs->lfs_frag = numfrags(fs, bsize); fs->lfs_frag = numfrags(fs, bsize);
fs->lfs_fbmask = fs->lfs_frag - 1; fs->lfs_fbmask = fs->lfs_frag - 1;
fs->lfs_fbshift = log2(fs->lfs_frag); fs->lfs_fbshift = lfs_log2(fs->lfs_frag);
fs->lfs_ifpb = bsize / sizeof(IFILE); fs->lfs_ifpb = bsize / sizeof(IFILE);
/* XXX ondisk32 */ /* XXX ondisk32 */
fs->lfs_nindir = bsize / sizeof(int32_t); fs->lfs_nindir = bsize / sizeof(int32_t);
@ -443,7 +443,7 @@ make_lfs(int devfd, uint secsize, struct partition *partp, int minfree,
if (fs->lfs_version == 1) { if (fs->lfs_version == 1) {
fs->lfs_sumsize = LFS_V1_SUMMARY_SIZE; fs->lfs_sumsize = LFS_V1_SUMMARY_SIZE;
fs->lfs_segshift = log2(ssize); fs->lfs_segshift = lfs_log2(ssize);
if (1 << fs->lfs_segshift != ssize) if (1 << fs->lfs_segshift != ssize)
fatal("%d: segment size not power of 2", ssize); fatal("%d: segment size not power of 2", ssize);
fs->lfs_segmask = ssize - 1; fs->lfs_segmask = ssize - 1;
@ -483,10 +483,10 @@ make_lfs(int devfd, uint secsize, struct partition *partp, int minfree,
* size, disk geometry and current time. * size, disk geometry and current time.
*/ */
db_per_blk = bsize/secsize; db_per_blk = bsize/secsize;
fs->lfs_blktodb = log2(db_per_blk); fs->lfs_blktodb = lfs_log2(db_per_blk);
fs->lfs_fsbtodb = log2(fsize / secsize); fs->lfs_fsbtodb = lfs_log2(fsize / secsize);
if (version == 1) { if (version == 1) {
fs->lfs_sushift = log2(fs->lfs_sepb); fs->lfs_sushift = lfs_log2(fs->lfs_sepb);
fs->lfs_fsbtodb = 0; fs->lfs_fsbtodb = 0;
fs->lfs_size = partp->p_size >> fs->lfs_blktodb; fs->lfs_size = partp->p_size >> fs->lfs_blktodb;
} }

6
sbin/newfs_lfs/misc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: misc.c,v 1.4 2003/08/07 10:04:35 agc Exp $ */ /* $NetBSD: misc.c,v 1.5 2006/05/11 16:56:50 mrg Exp $ */
/*- /*-
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -34,7 +34,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/5/93"; static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/5/93";
#else #else
__RCSID("$NetBSD: misc.c,v 1.4 2003/08/07 10:04:35 agc Exp $"); __RCSID("$NetBSD: misc.c,v 1.5 2006/05/11 16:56:50 mrg Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -47,7 +47,7 @@ __RCSID("$NetBSD: misc.c,v 1.4 2003/08/07 10:04:35 agc Exp $");
#include "extern.h" #include "extern.h"
u_int u_int
log2(u_int num) lfs_log2(u_int num)
{ {
u_int i, limit; u_int i, limit;