Module Name: src
Committed By: dholland
Date: Tue Sep 1 06:15:02 UTC 2015
Modified Files:
src/sbin/fsck_lfs: fsck_vars.h inode.c lfs.c pass1.c pass4.c pass5.c
pass6.c segwrite.c segwrite.h setup.c
src/sbin/newfs_lfs: make_lfs.c
Log Message:
Use daddr_t, not ulfs_daddr_t, as the latter's 32 bits wide.
Don't use either for on-disk items.
Declare external data in header files.
Part 3 of 3.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sbin/fsck_lfs/fsck_vars.h
cvs rdiff -u -r1.61 -r1.62 src/sbin/fsck_lfs/inode.c
cvs rdiff -u -r1.62 -r1.63 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.43 -r1.44 src/sbin/fsck_lfs/pass1.c \
src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.26 -r1.27 src/sbin/fsck_lfs/pass4.c
cvs rdiff -u -r1.35 -r1.36 src/sbin/fsck_lfs/pass5.c
cvs rdiff -u -r1.47 -r1.48 src/sbin/fsck_lfs/pass6.c
cvs rdiff -u -r1.6 -r1.7 src/sbin/fsck_lfs/segwrite.h
cvs rdiff -u -r1.58 -r1.59 src/sbin/fsck_lfs/setup.c
cvs rdiff -u -r1.47 -r1.48 src/sbin/newfs_lfs/make_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_lfs/fsck_vars.h
diff -u src/sbin/fsck_lfs/fsck_vars.h:1.14 src/sbin/fsck_lfs/fsck_vars.h:1.15
--- src/sbin/fsck_lfs/fsck_vars.h:1.14 Wed Aug 12 18:28:00 2015
+++ src/sbin/fsck_lfs/fsck_vars.h Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fsck_vars.h,v 1.14 2015/08/12 18:28:00 dholland Exp $ */
+/* $NetBSD: fsck_vars.h,v 1.15 2015/09/01 06:15:02 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -77,3 +77,9 @@ extern daddr_t n_blks; /* number of blo
extern ino_t n_files; /* number of files in use */
extern int no_roll_forward; /* Don't roll forward */
+
+blkcnt_t badblkcount; /* count of "bad" blocks */
+
+/* from setup.c */
+extern SEGUSE *seg_table;
+extern daddr_t *din_table;
Index: src/sbin/fsck_lfs/inode.c
diff -u src/sbin/fsck_lfs/inode.c:1.61 src/sbin/fsck_lfs/inode.c:1.62
--- src/sbin/fsck_lfs/inode.c:1.61 Tue Sep 1 06:08:37 2015
+++ src/sbin/fsck_lfs/inode.c Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.61 2015/09/01 06:08:37 dholland Exp $ */
+/* $NetBSD: inode.c,v 1.62 2015/09/01 06:15:02 dholland Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -87,9 +87,6 @@
#include "fsutil.h"
#include "extern.h"
-extern SEGUSE *seg_table;
-extern ulfs_daddr_t *din_table;
-
static int iblock(struct inodesc *, long, u_int64_t);
int blksreqd(struct lfs *, int);
int lfs_maxino(void);
@@ -128,7 +125,7 @@ ginode(ino_t ino)
int
ckinode(union lfs_dinode *dp, struct inodesc *idesc)
{
- ulfs_daddr_t lbn, pbn;
+ daddr_t lbn, pbn;
long ret, n, ndb, offset;
union lfs_dinode dino;
u_int64_t remsize, sizepb;
@@ -234,7 +231,8 @@ ckinode(union lfs_dinode *dp, struct ino
static int
iblock(struct inodesc *idesc, long ilevel, u_int64_t isize)
{
- ulfs_daddr_t *ap, *aplim;
+ unsigned j, maxindir;
+ daddr_t found;
struct ubuf *bp;
int i, n, (*func) (struct inodesc *), nif;
u_int64_t sizepb;
@@ -263,23 +261,25 @@ iblock(struct inodesc *idesc, long ileve
else
nif = howmany(isize, sizepb);
if (idesc->id_func == pass1check && nif < LFS_NINDIR(fs)) {
- aplim = ((ulfs_daddr_t *) bp->b_data) + LFS_NINDIR(fs);
- for (ap = ((ulfs_daddr_t *) bp->b_data) + nif; ap < aplim; ap++) {
- if (*ap == 0)
+ maxindir = LFS_NINDIR(fs);
+ for (j = nif; j < maxindir; j++) {
+ found = lfs_iblock_get(fs, bp->b_data, j);
+ if (found == 0)
continue;
(void)snprintf(buf, sizeof(buf),
"PARTIALLY TRUNCATED INODE I=%llu",
(unsigned long long)idesc->id_number);
if (dofix(idesc, buf)) {
- *ap = 0;
+ lfs_iblock_set(fs, bp->b_data, j, 0);
++diddirty;
}
}
}
- aplim = ((ulfs_daddr_t *) bp->b_data) + nif;
- for (ap = ((ulfs_daddr_t *) bp->b_data); ap < aplim; ap++) {
- if (*ap) {
- idesc->id_blkno = *ap;
+ maxindir = nif;
+ for (j = 0; j < maxindir; j++) {
+ found = lfs_iblock_get(fs, bp->b_data, j);
+ if (found) {
+ idesc->id_blkno = found;
if (ilevel == 0) {
/*
* dirscan needs lfs_lblkno.
@@ -370,7 +370,7 @@ cacheino(union lfs_dinode *dp, ino_t inu
blks = howmany(lfs_dino_getsize(fs, dp), lfs_sb_getbsize(fs));
if (blks > ULFS_NDADDR)
blks = ULFS_NDADDR + ULFS_NIADDR;
- inp = emalloc(sizeof(*inp) + (blks - 1) * sizeof(ulfs_daddr_t));
+ inp = emalloc(sizeof(*inp) + (blks - 1) * sizeof(inp->i_blks[0]));
inpp = &inphead[inumber % numdirs];
inp->i_nexthash = *inpp;
*inpp = inp;
@@ -383,7 +383,7 @@ cacheino(union lfs_dinode *dp, ino_t inu
inp->i_number = inumber;
inp->i_isize = lfs_dino_getsize(fs, dp);
- inp->i_numblks = blks * sizeof(ulfs_daddr_t);
+ inp->i_numblks = blks * sizeof(inp->i_blks[0]);
for (i=0; i<blks && i<ULFS_NDADDR; i++) {
inp->i_blks[i] = lfs_dino_getdb(fs, dp, i);
}
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.62 src/sbin/fsck_lfs/lfs.c:1.63
--- src/sbin/fsck_lfs/lfs.c:1.62 Tue Sep 1 06:13:57 2015
+++ src/sbin/fsck_lfs/lfs.c Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.62 2015/09/01 06:13:57 dholland Exp $ */
+/* $NetBSD: lfs.c,v 1.63 2015/09/01 06:15:02 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -212,12 +212,12 @@ ulfs_bmaparray(struct lfs * fs, struct u
bp->b_flags |= B_READ;
VOP_STRATEGY(bp);
}
- daddr = ((ulfs_daddr_t *) bp->b_data)[xap->in_off];
+ daddr = lfs_iblock_get(fs, bp->b_data, xap->in_off);
}
if (bp)
brelse(bp, 0);
- daddr = LFS_FSBTODB(fs, (ulfs_daddr_t) daddr);
+ daddr = LFS_FSBTODB(fs, daddr);
*bnp = daddr == 0 ? -1 : daddr;
return (0);
}
Index: src/sbin/fsck_lfs/pass1.c
diff -u src/sbin/fsck_lfs/pass1.c:1.43 src/sbin/fsck_lfs/pass1.c:1.44
--- src/sbin/fsck_lfs/pass1.c:1.43 Tue Sep 1 06:12:04 2015
+++ src/sbin/fsck_lfs/pass1.c Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.43 2015/09/01 06:12:04 dholland Exp $ */
+/* $NetBSD: pass1.c,v 1.44 2015/09/01 06:15:02 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -55,16 +55,13 @@
#include "extern.h"
#include "fsutil.h"
-SEGUSE *seg_table;
-extern ulfs_daddr_t *din_table;
-
-ulfs_daddr_t badblk;
-static ulfs_daddr_t dupblk;
+blkcnt_t badblkcount;
+static blkcnt_t dupblkcount;
static int i_d_cmp(const void *, const void *);
struct ino_daddr {
ino_t ino;
- ulfs_daddr_t daddr;
+ daddr_t daddr;
};
static int
@@ -255,7 +252,7 @@ checkinode(ino_t inumber, struct inodesc
*/
if (lfs_dino_getsize(fs, dp) < lfs_sb_getmaxsymlinklen(fs) ||
(lfs_sb_getmaxsymlinklen(fs) == 0 && lfs_dino_getblocks(fs, dp) == 0)) {
- ndb = howmany(lfs_dino_getsize(fs, dp), sizeof(ulfs_daddr_t));
+ ndb = howmany(lfs_dino_getsize(fs, dp), LFS_BLKPTRSIZE(fs));
if (ndb > ULFS_NDADDR) {
j = ndb - ULFS_NDADDR;
for (ndb = 1; j > 1; j--)
@@ -324,7 +321,7 @@ checkinode(ino_t inumber, struct inodesc
/* XXX: why VTOD(vp) instead of dp here? */
typemap[inumber] = LFS_IFTODT(mode);
- badblk = dupblk = 0;
+ badblkcount = dupblkcount = 0;
idesc->id_number = inumber;
(void) ckinode(VTOD(vp), idesc);
if (lfs_dino_getblocks(fs, dp) != idesc->id_entryno) {
@@ -361,7 +358,7 @@ pass1check(struct inodesc *idesc)
if ((anyout = chkrange(blkno, idesc->id_numfrags)) != 0) {
blkerror(idesc->id_number, "BAD", blkno);
- if (badblk++ >= MAXBAD) {
+ if (badblkcount++ >= MAXBAD) {
pwarn("EXCESSIVE BAD BLKS I=%llu",
(unsigned long long)idesc->id_number);
if (preen)
@@ -390,7 +387,7 @@ pass1check(struct inodesc *idesc)
(long long)idesc->id_lblkno,
(long long)testbmap(blkno));
#endif
- if (dupblk++ >= MAXDUP) {
+ if (dupblkcount++ >= MAXDUP) {
pwarn("EXCESSIVE DUP BLKS I=%llu",
(unsigned long long)idesc->id_number);
if (preen)
Index: src/sbin/fsck_lfs/segwrite.c
diff -u src/sbin/fsck_lfs/segwrite.c:1.43 src/sbin/fsck_lfs/segwrite.c:1.44
--- src/sbin/fsck_lfs/segwrite.c:1.43 Tue Sep 1 06:08:37 2015
+++ src/sbin/fsck_lfs/segwrite.c Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.c,v 1.43 2015/09/01 06:08:37 dholland Exp $ */
+/* $NetBSD: segwrite.c,v 1.44 2015/09/01 06:15:02 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -264,7 +264,7 @@ lfs_writeinode(struct lfs * fs, struct s
sp->ibp == NULL) {
/* Allocate a new segment if necessary. */
if (sp->seg_bytes_left < lfs_sb_getibsize(fs) ||
- sp->sum_bytes_left < sizeof(ulfs_daddr_t))
+ sp->sum_bytes_left < LFS_BLKPTRSIZE(fs))
(void) lfs_writeseg(fs, sp);
/* Get next inode block. */
@@ -288,11 +288,11 @@ lfs_writeinode(struct lfs * fs, struct s
lfs_sb_subavail(fs, lfs_btofsb(fs, lfs_sb_getibsize(fs)));
/* Set remaining space counters. */
sp->seg_bytes_left -= lfs_sb_getibsize(fs);
- sp->sum_bytes_left -= sizeof(ulfs_daddr_t);
- ndx = lfs_sb_getsumsize(fs) / sizeof(ulfs_daddr_t) -
+ sp->sum_bytes_left -= LFS_BLKPTRSIZE(fs);
+ ndx = lfs_sb_getsumsize(fs) / sizeof(uint32_t) -
sp->ninodes / LFS_INOPB(fs) - 1;
/* XXX ondisk32 */
- ((ulfs_daddr_t *) (sp->segsum))[ndx] = daddr;
+ ((uint32_t *) (sp->segsum))[ndx] = daddr;
}
/* Update the inode times and copy the inode onto the inode page. */
ts.tv_nsec = 0;
@@ -384,7 +384,7 @@ lfs_gatherblock(struct segment * sp, str
*/
fs = sp->fs;
blksinblk = howmany(bp->b_bcount, lfs_sb_getbsize(fs));
- if (sp->sum_bytes_left < sizeof(ulfs_daddr_t) * blksinblk ||
+ if (sp->sum_bytes_left < LFS_BLKPTRSIZE(fs) * blksinblk ||
sp->seg_bytes_left < bp->b_bcount) {
lfs_updatemeta(sp);
@@ -413,7 +413,7 @@ lfs_gatherblock(struct segment * sp, str
lfs_fi_setblock(fs, sp->fip, bn, bp->b_lblkno + j);;
}
- sp->sum_bytes_left -= sizeof(ulfs_daddr_t) * blksinblk;
+ sp->sum_bytes_left -= LFS_BLKPTRSIZE(fs) * blksinblk;
sp->seg_bytes_left -= bp->b_bcount;
return 0;
}
@@ -451,9 +451,9 @@ loop:
*
* Account for this change in the segment table.
*/
-void
+static void
lfs_update_single(struct lfs * fs, struct segment * sp, daddr_t lbn,
- ulfs_daddr_t ndaddr, int size)
+ daddr_t ndaddr, int size)
{
SEGUSE *sup;
struct ubuf *bp;
@@ -1037,7 +1037,7 @@ lfs_writevnodes(struct lfs *fs, struct s
}
void
-lfs_writesuper(struct lfs *fs, ulfs_daddr_t daddr)
+lfs_writesuper(struct lfs *fs, daddr_t daddr)
{
struct ubuf *bp;
Index: src/sbin/fsck_lfs/pass4.c
diff -u src/sbin/fsck_lfs/pass4.c:1.26 src/sbin/fsck_lfs/pass4.c:1.27
--- src/sbin/fsck_lfs/pass4.c:1.26 Wed Aug 12 18:28:00 2015
+++ src/sbin/fsck_lfs/pass4.c Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pass4.c,v 1.26 2015/08/12 18:28:00 dholland Exp $ */
+/* $NetBSD: pass4.c,v 1.27 2015/09/01 06:15:02 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -52,8 +52,6 @@
#include "fsck.h"
#include "extern.h"
-extern SEGUSE *seg_table;
-
static int check_orphan(struct inodesc *idp);
static int
Index: src/sbin/fsck_lfs/pass5.c
diff -u src/sbin/fsck_lfs/pass5.c:1.35 src/sbin/fsck_lfs/pass5.c:1.36
--- src/sbin/fsck_lfs/pass5.c:1.35 Mon Aug 3 04:16:10 2015
+++ src/sbin/fsck_lfs/pass5.c Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pass5.c,v 1.35 2015/08/03 04:16:10 dholland Exp $ */
+/* $NetBSD: pass5.c,v 1.36 2015/09/01 06:15:02 dholland Exp $ */
/*-
* Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -51,7 +51,6 @@
#include "extern.h"
#include "fsutil.h"
-extern SEGUSE *seg_table;
extern off_t locked_queue_bytes;
void
Index: src/sbin/fsck_lfs/pass6.c
diff -u src/sbin/fsck_lfs/pass6.c:1.47 src/sbin/fsck_lfs/pass6.c:1.48
--- src/sbin/fsck_lfs/pass6.c:1.47 Tue Sep 1 06:13:57 2015
+++ src/sbin/fsck_lfs/pass6.c Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pass6.c,v 1.47 2015/09/01 06:13:57 dholland Exp $ */
+/* $NetBSD: pass6.c,v 1.48 2015/09/01 06:15:02 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -62,9 +62,6 @@
extern u_int32_t cksum(void *, size_t);
extern u_int32_t lfs_sb_cksum(struct dlfs *);
-extern ulfs_daddr_t badblk;
-extern SEGUSE *seg_table;
-
static int nnewblocks;
/*
@@ -318,7 +315,7 @@ pass6check(struct inodesc * idesc)
}
if (anyout) {
blkerror(idesc->id_number, "BAD", idesc->id_blkno);
- if (badblk++ >= MAXBAD) {
+ if (badblkcount++ >= MAXBAD) {
pwarn("EXCESSIVE BAD BLKS I=%llu",
(unsigned long long)idesc->id_number);
if (preen)
@@ -472,7 +469,7 @@ readdress_inode(union lfs_dinode *dp, da
* Allocate the given inode from the free list.
*/
static void
-alloc_inode(ino_t thisino, ulfs_daddr_t daddr)
+alloc_inode(ino_t thisino, daddr_t daddr)
{
ino_t ino, nextfree, oldhead;
IFILE *ifp;
@@ -481,8 +478,8 @@ alloc_inode(ino_t thisino, ulfs_daddr_t
CLEANERINFO *cip;
if (debug)
- pwarn("allocating ino %d at 0x%x\n", (int)thisino,
- (unsigned)daddr);
+ pwarn("allocating ino %ju at 0x%jx\n", (uintmax_t)thisino,
+ (intmax_t)daddr);
while (thisino >= maxino) {
extend_ifile(fs);
}
Index: src/sbin/fsck_lfs/segwrite.h
diff -u src/sbin/fsck_lfs/segwrite.h:1.6 src/sbin/fsck_lfs/segwrite.h:1.7
--- src/sbin/fsck_lfs/segwrite.h:1.6 Wed Aug 12 18:27:01 2015
+++ src/sbin/fsck_lfs/segwrite.h Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.h,v 1.6 2015/08/12 18:27:01 dholland Exp $ */
+/* $NetBSD: segwrite.h,v 1.7 2015/09/01 06:15:02 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -45,12 +45,11 @@ int lfs_writeinode(struct lfs *, struct
int lfs_gatherblock(struct segment *, struct ubuf *);
int lfs_gather(struct lfs *, struct segment *, struct uvnode *,
int (*match) (struct lfs *, struct ubuf *));
-void lfs_update_single(struct lfs *, struct segment *, daddr_t, int32_t, int);
void lfs_updatemeta(struct segment *);
int lfs_initseg(struct lfs *);
void lfs_newseg(struct lfs *);
int lfs_writeseg(struct lfs *, struct segment *);
-void lfs_writesuper(struct lfs *, ulfs_daddr_t);
+void lfs_writesuper(struct lfs *, daddr_t);
int lfs_match_data(struct lfs *, struct ubuf *);
int lfs_match_indir(struct lfs *, struct ubuf *);
@@ -64,4 +63,3 @@ int lfs_seglock(struct lfs *, unsigned l
void lfs_segunlock(struct lfs *);
int lfs_writevnodes(struct lfs *, struct segment *, int);
-void lfs_writesuper(struct lfs *, ulfs_daddr_t);
Index: src/sbin/fsck_lfs/setup.c
diff -u src/sbin/fsck_lfs/setup.c:1.58 src/sbin/fsck_lfs/setup.c:1.59
--- src/sbin/fsck_lfs/setup.c:1.58 Tue Sep 1 06:12:33 2015
+++ src/sbin/fsck_lfs/setup.c Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.58 2015/09/01 06:12:33 dholland Exp $ */
+/* $NetBSD: setup.c,v 1.59 2015/09/01 06:15:02 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@
extern u_int32_t cksum(void *, size_t);
static uint64_t calcmaxfilesize(unsigned);
-ulfs_daddr_t *din_table;
+daddr_t *din_table;
SEGUSE *seg_table;
#ifdef DKTYPENAMES
Index: src/sbin/newfs_lfs/make_lfs.c
diff -u src/sbin/newfs_lfs/make_lfs.c:1.47 src/sbin/newfs_lfs/make_lfs.c:1.48
--- src/sbin/newfs_lfs/make_lfs.c:1.47 Tue Sep 1 06:12:33 2015
+++ src/sbin/newfs_lfs/make_lfs.c Tue Sep 1 06:15:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: make_lfs.c,v 1.47 2015/09/01 06:12:33 dholland Exp $ */
+/* $NetBSD: make_lfs.c,v 1.48 2015/09/01 06:15:02 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: make_lfs.c,v 1.47 2015/09/01 06:12:33 dholland Exp $");
+__RCSID("$NetBSD: make_lfs.c,v 1.48 2015/09/01 06:15:02 dholland Exp $");
#endif
#endif /* not lint */
@@ -101,7 +101,8 @@ __RCSID("$NetBSD: make_lfs.c,v 1.47 2015
#include "segwrite.h"
extern int Nflag; /* Don't write anything */
-ulfs_daddr_t ifibc; /* How many indirect blocks */
+
+static blkcnt_t ifibc; /* How many indirect blocks */
#ifdef MAKE_LF_DIR
# define HIGHEST_USED_INO LOSTFOUNDINO
@@ -410,7 +411,7 @@ make_lfs(int devfd, uint secsize, struct
bufinit(tnseg / tsepb);
/* Initialize LFS subsystem with blank superblock and ifile. */
- fs = lfs_init(devfd, start, (ulfs_daddr_t)0, 1, 1/* XXX debug*/);
+ fs = lfs_init(devfd, start, 0, 1, 1/* XXX debug*/);
save_devvp = fs->lfs_devvp;
vp = fs->lfs_ivnode;
/* XXX this seems like a rubbish */
