Module Name: src
Committed By: joerg
Date: Fri Apr 3 19:36:33 UTC 2020
Modified Files:
src/sbin/fsck: fsutil.c fsutil.h
src/sbin/fsck_lfs: bufcache.c dir.c extern.h fsck.h fsck_vars.h inode.c
lfs.c main.c pass0.c pass1.c pass2.c pass4.c pass5.c pass6.c
segwrite.c setup.c utilities.c vars.c vnode.c
Log Message:
Avoid common symbols for fsck_lfs.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sbin/fsck/fsutil.c
cvs rdiff -u -r1.20 -r1.21 src/sbin/fsck/fsutil.h
cvs rdiff -u -r1.20 -r1.21 src/sbin/fsck_lfs/bufcache.c
cvs rdiff -u -r1.46 -r1.47 src/sbin/fsck_lfs/dir.c src/sbin/fsck_lfs/pass1.c \
src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.15 -r1.16 src/sbin/fsck_lfs/extern.h \
src/sbin/fsck_lfs/fsck_vars.h src/sbin/fsck_lfs/vnode.c
cvs rdiff -u -r1.26 -r1.27 src/sbin/fsck_lfs/fsck.h
cvs rdiff -u -r1.69 -r1.70 src/sbin/fsck_lfs/inode.c
cvs rdiff -u -r1.74 -r1.75 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.54 -r1.55 src/sbin/fsck_lfs/main.c
cvs rdiff -u -r1.42 -r1.43 src/sbin/fsck_lfs/pass0.c
cvs rdiff -u -r1.34 -r1.35 src/sbin/fsck_lfs/pass2.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/fsck_lfs/pass4.c
cvs rdiff -u -r1.36 -r1.37 src/sbin/fsck_lfs/pass5.c
cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_lfs/pass6.c
cvs rdiff -u -r1.61 -r1.62 src/sbin/fsck_lfs/setup.c
cvs rdiff -u -r1.41 -r1.42 src/sbin/fsck_lfs/utilities.c
cvs rdiff -u -r1.18 -r1.19 src/sbin/fsck_lfs/vars.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/fsutil.c
diff -u src/sbin/fsck/fsutil.c:1.26 src/sbin/fsck/fsutil.c:1.27
--- src/sbin/fsck/fsutil.c:1.26 Sun Jun 21 04:01:40 2015
+++ src/sbin/fsck/fsutil.c Fri Apr 3 19:36:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fsutil.c,v 1.26 2015/06/21 04:01:40 dholland Exp $ */
+/* $NetBSD: fsutil.c,v 1.27 2020/04/03 19:36:32 joerg Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fsutil.c,v 1.26 2015/06/21 04:01:40 dholland Exp $");
+__RCSID("$NetBSD: fsutil.c,v 1.27 2020/04/03 19:36:32 joerg Exp $");
#endif /* not lint */
/*
@@ -66,10 +66,12 @@ __RCSID("$NetBSD: fsutil.c,v 1.26 2015/0
volatile sig_atomic_t returntosingle;
+void (*ckfinish)(int);
+
static const char *dev = NULL;
static int hot = 0;
static int preen = 0;
-int quiet;
+int quiet; /* don't report clean filesystems */
#define F_ERROR 0x80000000
void
Index: src/sbin/fsck/fsutil.h
diff -u src/sbin/fsck/fsutil.h:1.20 src/sbin/fsck/fsutil.h:1.21
--- src/sbin/fsck/fsutil.h:1.20 Sun Jun 21 03:58:36 2015
+++ src/sbin/fsck/fsutil.h Fri Apr 3 19:36:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fsutil.h,v 1.20 2015/06/21 03:58:36 dholland Exp $ */
+/* $NetBSD: fsutil.h,v 1.21 2020/04/03 19:36:32 joerg Exp $ */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -50,8 +50,10 @@ struct fstab;
int checkfstab(int, int, void *(*)(struct fstab *),
int (*) (const char *, const char *, const char *, void *, pid_t *));
-void (*ckfinish)(int);
+extern void (*ckfinish)(int);
extern volatile sig_atomic_t returntosingle;
void catch(int) __dead;
void catchquit(int);
void voidquit(int);
+
+extern int quiet;
Index: src/sbin/fsck_lfs/bufcache.c
diff -u src/sbin/fsck_lfs/bufcache.c:1.20 src/sbin/fsck_lfs/bufcache.c:1.21
--- src/sbin/fsck_lfs/bufcache.c:1.20 Fri Mar 30 12:56:46 2018
+++ src/sbin/fsck_lfs/bufcache.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bufcache.c,v 1.20 2018/03/30 12:56:46 christos Exp $ */
+/* $NetBSD: bufcache.c,v 1.21 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -44,7 +44,7 @@
#include <util.h>
#include "bufcache.h"
-#include "vnode.h"
+#include "extern.h"
/*
* Definitions for the buffer free lists.
Index: src/sbin/fsck_lfs/dir.c
diff -u src/sbin/fsck_lfs/dir.c:1.46 src/sbin/fsck_lfs/dir.c:1.47
--- src/sbin/fsck_lfs/dir.c:1.46 Mon Sep 21 01:24:23 2015
+++ src/sbin/fsck_lfs/dir.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.46 2015/09/21 01:24:23 dholland Exp $ */
+/* $NetBSD: dir.c,v 1.47 2020/04/03 19:36:33 joerg Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -45,7 +45,6 @@
#include <string.h>
#include "bufcache.h"
-#include "vnode.h"
#include "lfs_user.h"
#include "fsck.h"
@@ -53,7 +52,6 @@
#include "extern.h"
const char *lfname = "lost+found";
-int lfmode = 01700;
#if 0
struct lfs_dirtemplate emptydir = {
.dot_ino = 0,
Index: src/sbin/fsck_lfs/pass1.c
diff -u src/sbin/fsck_lfs/pass1.c:1.46 src/sbin/fsck_lfs/pass1.c:1.47
--- src/sbin/fsck_lfs/pass1.c:1.46 Sun Feb 23 15:11:33 2020
+++ src/sbin/fsck_lfs/pass1.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.46 2020/02/23 15:11:33 riastradh Exp $ */
+/* $NetBSD: pass1.c,v 1.47 2020/04/03 19:36:33 joerg Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -48,7 +48,6 @@
#include <util.h>
#include "bufcache.h"
-#include "vnode.h"
#include "lfs_user.h"
#include "fsck.h"
Index: src/sbin/fsck_lfs/segwrite.c
diff -u src/sbin/fsck_lfs/segwrite.c:1.46 src/sbin/fsck_lfs/segwrite.c:1.47
--- src/sbin/fsck_lfs/segwrite.c:1.46 Sat Jun 10 08:13:15 2017
+++ src/sbin/fsck_lfs/segwrite.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.c,v 1.46 2017/06/10 08:13:15 pgoyette Exp $ */
+/* $NetBSD: segwrite.c,v 1.47 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -86,13 +86,11 @@
#include <util.h>
#include "bufcache.h"
-#include "vnode.h"
+#include "extern.h"
#include "lfs_user.h"
#include "segwrite.h"
/* Compatibility definitions */
-extern off_t locked_queue_bytes;
-int locked_queue_count;
off_t written_bytes = 0;
off_t written_data = 0;
off_t written_indir = 0;
@@ -102,10 +100,6 @@ int written_inodes = 0;
/* Global variables */
time_t write_time;
-extern u_int32_t cksum(void *, size_t);
-extern u_int32_t lfs_sb_cksum(struct lfs *);
-extern int preen;
-
static void lfs_shellsort(struct lfs *,
struct ubuf **, union lfs_blocks *, int, int);
Index: src/sbin/fsck_lfs/extern.h
diff -u src/sbin/fsck_lfs/extern.h:1.15 src/sbin/fsck_lfs/extern.h:1.16
--- src/sbin/fsck_lfs/extern.h:1.15 Sat Oct 3 08:29:06 2015
+++ src/sbin/fsck_lfs/extern.h Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.15 2015/10/03 08:29:06 dholland Exp $ */
+/* $NetBSD: extern.h,v 1.16 2020/04/03 19:36:33 joerg Exp $ */
/*
* Copyright (c) 1994 James A. Jegers
@@ -24,19 +24,29 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <stdarg.h>
+#include "vnode.h"
+
+struct inodesc;
+union lfs_dinode;
+struct inode;
+struct lfs;
+union lfs_dirheader;
+
void adjust(struct inodesc *, short);
int allocblk(long);
int allocdir(ino_t, ino_t, int);
void blkerror(ino_t, const char *, daddr_t);
void cacheino(union lfs_dinode *, ino_t);
int changeino(ino_t, const char *, ino_t);
+u_int32_t cksum(void *, size_t);
struct fstab;
void checkinode(ino_t, struct inodesc *);
int chkrange(daddr_t, int);
void ckfini(int);
int ckinode(union lfs_dinode *, struct inodesc *);
void clri(struct inodesc *, const char *, int);
-int dircheck(struct inodesc *, LFS_DIRHEADER *);
+int dircheck(struct inodesc *, union lfs_dirheader *);
void direrror(ino_t, const char *);
int dirscan(struct inodesc *);
int dofix(struct inodesc *, const char *);
@@ -51,6 +61,7 @@ void getpathname(char *, size_t, ino_t,
void inocleanup(void);
void inodirty(struct inode *);
int linkup(ino_t, ino_t);
+ u_int32_t lfs_sb_cksum(struct lfs *);
int makeentry(ino_t, ino_t, const char *);
void pass0(void);
void pass1(void);
@@ -65,6 +76,17 @@ void pass6(void);
int pass6check(struct inodesc *);
void pinode(ino_t);
void propagate(void);
+void pwarn(const char *, ...);
int reply(const char *);
void resetinodebuf(void);
int setup(const char *);
+
+extern struct uvnodelst vnodelist;
+extern struct uvnodelst getvnodelist[VNODE_HASH_MAX];
+extern int nvnodes;
+extern void (*panic_func)(int, const char *, va_list);
+extern int fake_cleanseg;
+extern off_t locked_queue_bytes;
+extern int locked_queue_count;
+extern int preen;
+extern time_t write_time;
Index: src/sbin/fsck_lfs/fsck_vars.h
diff -u src/sbin/fsck_lfs/fsck_vars.h:1.15 src/sbin/fsck_lfs/fsck_vars.h:1.16
--- src/sbin/fsck_lfs/fsck_vars.h:1.15 Tue Sep 1 06:15:02 2015
+++ src/sbin/fsck_lfs/fsck_vars.h Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fsck_vars.h,v 1.15 2015/09/01 06:15:02 dholland Exp $ */
+/* $NetBSD: fsck_vars.h,v 1.16 2020/04/03 19:36:33 joerg Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -78,7 +78,7 @@ extern ino_t n_files; /* number of file
extern int no_roll_forward; /* Don't roll forward */
-blkcnt_t badblkcount; /* count of "bad" blocks */
+extern blkcnt_t badblkcount; /* count of "bad" blocks */
/* from setup.c */
extern SEGUSE *seg_table;
Index: src/sbin/fsck_lfs/vnode.c
diff -u src/sbin/fsck_lfs/vnode.c:1.15 src/sbin/fsck_lfs/vnode.c:1.16
--- src/sbin/fsck_lfs/vnode.c:1.15 Wed Aug 19 20:33:29 2015
+++ src/sbin/fsck_lfs/vnode.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.c,v 1.15 2015/08/19 20:33:29 dholland Exp $ */
+/* $NetBSD: vnode.c,v 1.16 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -52,7 +52,7 @@
#include <util.h>
#include "bufcache.h"
-#include "vnode.h"
+#include "extern.h"
#include "kernelops.h"
struct uvnodelst vnodelist;
Index: src/sbin/fsck_lfs/fsck.h
diff -u src/sbin/fsck_lfs/fsck.h:1.26 src/sbin/fsck_lfs/fsck.h:1.27
--- src/sbin/fsck_lfs/fsck.h:1.26 Sat Oct 3 08:30:13 2015
+++ src/sbin/fsck_lfs/fsck.h Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fsck.h,v 1.26 2015/10/03 08:30:13 dholland Exp $ */
+/* $NetBSD: fsck.h,v 1.27 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -142,7 +142,7 @@ struct zlncnt {
/*
* Inode cache data structures.
*/
-struct inoinfo {
+extern struct inoinfo {
struct inoinfo *i_nexthash; /* next entry in hash chain */
struct inoinfo *i_child, *i_sibling, *i_parentp;
ino_t i_number; /* inode number of this entry */
@@ -163,7 +163,7 @@ struct inoinfo {
#define clrbmap(blkno) blockmap[blkno] = 0
#endif
-int Uflag; /* resolve user names */
+extern int Uflag; /* resolve user names */
#define STOP 0x01
#define SKIP 0x02
Index: src/sbin/fsck_lfs/inode.c
diff -u src/sbin/fsck_lfs/inode.c:1.69 src/sbin/fsck_lfs/inode.c:1.70
--- src/sbin/fsck_lfs/inode.c:1.69 Sat Jun 10 08:13:15 2017
+++ src/sbin/fsck_lfs/inode.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.69 2017/06/10 08:13:15 pgoyette Exp $ */
+/* $NetBSD: inode.c,v 1.70 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -80,7 +80,6 @@
#include <util.h>
#include "bufcache.h"
-#include "vnode.h"
#include "lfs_user.h"
#include "fsck.h"
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.74 src/sbin/fsck_lfs/lfs.c:1.75
--- src/sbin/fsck_lfs/lfs.c:1.74 Tue Jun 12 20:12:21 2018
+++ src/sbin/fsck_lfs/lfs.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.74 2018/06/12 20:12:21 zafer Exp $ */
+/* $NetBSD: lfs.c,v 1.75 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -88,21 +88,13 @@
#include <util.h>
#include "bufcache.h"
-#include "vnode.h"
+#include "extern.h"
#include "lfs_user.h"
#include "segwrite.h"
#include "kernelops.h"
#define panic call_panic
-extern u_int32_t cksum(void *, size_t);
-extern u_int32_t lfs_sb_cksum(struct lfs *);
-extern void pwarn(const char *, ...);
-
-extern struct uvnodelst vnodelist;
-extern struct uvnodelst getvnodelist[VNODE_HASH_MAX];
-extern int nvnodes;
-
long dev_bsize = DEV_BSIZE;
static int
Index: src/sbin/fsck_lfs/main.c
diff -u src/sbin/fsck_lfs/main.c:1.54 src/sbin/fsck_lfs/main.c:1.55
--- src/sbin/fsck_lfs/main.c:1.54 Thu Aug 15 03:10:43 2019
+++ src/sbin/fsck_lfs/main.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.54 2019/08/15 03:10:43 kamil Exp $ */
+/* $NetBSD: main.c,v 1.55 2020/04/03 19:36:33 joerg Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -53,12 +53,12 @@
#include "fsutil.h"
#include "exitvalues.h"
+int Uflag;
static int argtoi(int, const char *, const char *, int);
static int checkfilesys(const char *, char *, long, int);
static void usage(void);
static void efun(int, const char *, ...);
-extern void (*panic_func)(int, const char *, va_list);
static void
efun(int eval, const char *fmt, ...)
Index: src/sbin/fsck_lfs/pass0.c
diff -u src/sbin/fsck_lfs/pass0.c:1.42 src/sbin/fsck_lfs/pass0.c:1.43
--- src/sbin/fsck_lfs/pass0.c:1.42 Tue Sep 1 06:11:06 2015
+++ src/sbin/fsck_lfs/pass0.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pass0.c,v 1.42 2015/09/01 06:11:06 dholland Exp $ */
+/* $NetBSD: pass0.c,v 1.43 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -77,15 +77,12 @@
#include <util.h>
#include "bufcache.h"
-#include "vnode.h"
#include "lfs_user.h"
#include "fsck.h"
#include "extern.h"
#include "fsutil.h"
-extern int fake_cleanseg;
-
/*
* Pass 0. Check the LFS partial segments for valid checksums, correcting
* if necessary. Also check for valid offsets for inode and finfo blocks.
Index: src/sbin/fsck_lfs/pass2.c
diff -u src/sbin/fsck_lfs/pass2.c:1.34 src/sbin/fsck_lfs/pass2.c:1.35
--- src/sbin/fsck_lfs/pass2.c:1.34 Mon Sep 21 01:24:23 2015
+++ src/sbin/fsck_lfs/pass2.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pass2.c,v 1.34 2015/09/21 01:24:23 dholland Exp $ */
+/* $NetBSD: pass2.c,v 1.35 2020/04/03 19:36:33 joerg Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -45,7 +45,6 @@
#include <string.h>
#include "bufcache.h"
-#include "vnode.h"
#include "lfs_user.h"
#include "fsck.h"
Index: src/sbin/fsck_lfs/pass4.c
diff -u src/sbin/fsck_lfs/pass4.c:1.27 src/sbin/fsck_lfs/pass4.c:1.28
--- src/sbin/fsck_lfs/pass4.c:1.27 Tue Sep 1 06:15:02 2015
+++ src/sbin/fsck_lfs/pass4.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pass4.c,v 1.27 2015/09/01 06:15:02 dholland Exp $ */
+/* $NetBSD: pass4.c,v 1.28 2020/04/03 19:36:33 joerg Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -45,7 +45,6 @@
#include <string.h>
#include "bufcache.h"
-#include "vnode.h"
#include "lfs_user.h"
#include "fsutil.h"
Index: src/sbin/fsck_lfs/pass5.c
diff -u src/sbin/fsck_lfs/pass5.c:1.36 src/sbin/fsck_lfs/pass5.c:1.37
--- src/sbin/fsck_lfs/pass5.c:1.36 Tue Sep 1 06:15:02 2015
+++ src/sbin/fsck_lfs/pass5.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pass5.c,v 1.36 2015/09/01 06:15:02 dholland Exp $ */
+/* $NetBSD: pass5.c,v 1.37 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -44,15 +44,12 @@
#include <string.h>
#include "bufcache.h"
-#include "vnode.h"
#include "lfs_user.h"
#include "fsck.h"
#include "extern.h"
#include "fsutil.h"
-extern off_t locked_queue_bytes;
-
void
pass5(void)
{
Index: src/sbin/fsck_lfs/pass6.c
diff -u src/sbin/fsck_lfs/pass6.c:1.50 src/sbin/fsck_lfs/pass6.c:1.51
--- src/sbin/fsck_lfs/pass6.c:1.50 Sat Jun 10 08:13:15 2017
+++ src/sbin/fsck_lfs/pass6.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pass6.c,v 1.50 2017/06/10 08:13:15 pgoyette Exp $ */
+/* $NetBSD: pass6.c,v 1.51 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -51,7 +51,6 @@
#include <util.h>
#include "bufcache.h"
-#include "vnode.h"
#include "lfs_user.h"
#include "segwrite.h"
@@ -59,9 +58,6 @@
#include "extern.h"
#include "fsutil.h"
-extern u_int32_t cksum(void *, size_t);
-extern u_int32_t lfs_sb_cksum(struct dlfs *);
-
static int nnewblocks;
/*
Index: src/sbin/fsck_lfs/setup.c
diff -u src/sbin/fsck_lfs/setup.c:1.61 src/sbin/fsck_lfs/setup.c:1.62
--- src/sbin/fsck_lfs/setup.c:1.61 Thu Mar 17 18:56:14 2016
+++ src/sbin/fsck_lfs/setup.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.61 2016/03/17 18:56:14 christos Exp $ */
+/* $NetBSD: setup.c,v 1.62 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -88,14 +88,12 @@
#include <util.h>
#include "bufcache.h"
-#include "vnode.h"
#include "lfs_user.h"
#include "fsck.h"
#include "extern.h"
#include "fsutil.h"
-extern u_int32_t cksum(void *, size_t);
static uint64_t calcmaxfilesize(unsigned);
daddr_t *din_table;
@@ -157,8 +155,6 @@ reset_maxino(ino_t len)
return;
}
-
-extern time_t write_time;
int
setup(const char *dev)
Index: src/sbin/fsck_lfs/utilities.c
diff -u src/sbin/fsck_lfs/utilities.c:1.41 src/sbin/fsck_lfs/utilities.c:1.42
--- src/sbin/fsck_lfs/utilities.c:1.41 Wed Aug 12 18:28:00 2015
+++ src/sbin/fsck_lfs/utilities.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: utilities.c,v 1.41 2015/08/12 18:28:00 dholland Exp $ */
+/* $NetBSD: utilities.c,v 1.42 2020/04/03 19:36:33 joerg Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -49,7 +49,6 @@
#include <signal.h>
#include "bufcache.h"
-#include "vnode.h"
#include "lfs_user.h"
#include "segwrite.h"
@@ -60,8 +59,6 @@
long diskreads, totalreads; /* Disk cache statistics */
-extern off_t locked_queue_bytes;
-
int
ftypeok(union lfs_dinode * dp)
{
Index: src/sbin/fsck_lfs/vars.c
diff -u src/sbin/fsck_lfs/vars.c:1.18 src/sbin/fsck_lfs/vars.c:1.19
--- src/sbin/fsck_lfs/vars.c:1.18 Wed Aug 12 18:28:00 2015
+++ src/sbin/fsck_lfs/vars.c Fri Apr 3 19:36:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vars.c,v 1.18 2015/08/12 18:28:00 dholland Exp $ */
+/* $NetBSD: vars.c,v 1.19 2020/04/03 19:36:33 joerg Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -52,7 +52,6 @@ int bflag; /* location of alternate su
int debug; /* output debugging info */
int exitonfail;
int preen; /* just fix normal inconsistencies */
-int quiet; /* don't report clean filesystems */
char havesb; /* superblock has been read */
char skipclean; /* skip clean file systems if preening */
int fsmodified; /* 1 => write done to file system */
@@ -72,9 +71,11 @@ char *typemap; /* ptr to inode type ta
int16_t *lncntp; /* ptr to link count table */
ino_t lfdir; /* lost & found directory inode number */
-int lfmode; /* lost & found directory creation mode */
+int lfmode = 01700; /* lost & found directory creation mode */
daddr_t n_blks; /* number of blocks in use */
ino_t n_files; /* number of files in use */
int no_roll_forward = 0; /* don't roll forward */
+
+struct inoinfo **inphead, **inpsort;
