Index: sbin/fsck_ffs/main.c
===================================================================
--- sbin/fsck_ffs/main.c
+++ sbin/fsck_ffs/main.c
@@ -272,7 +272,6 @@
 	 * exit status will cause a foreground check to be run.
 	 */
 	sblock_init();
-	bufinit();
 	if (bkgrdcheck) {
 		if ((fsreadfd = open(filesys, O_RDONLY)) < 0 || readsb(0) == 0)
 			exit(3);	/* Cannot read superblock */
@@ -310,6 +309,7 @@
 				exit(0);
 			}
 			if ((sblock.fs_flags & (FS_UNCLEAN | FS_NEEDSFSCK)) == 0) {
+				bufinit();
 				gjournal_check(filesys);
 				if (chkdoreload(mntp) == 0)
 					exit(0);
Index: sbin/fsck_ffs/setup.c
===================================================================
--- sbin/fsck_ffs/setup.c
+++ sbin/fsck_ffs/setup.c
@@ -298,6 +298,7 @@
 		    (uintmax_t)numdirs * sizeof(struct inoinfo *));
 		goto badsb;
 	}
+	bufinit();
 	if (sblock.fs_flags & FS_DOSOFTDEP)
 		usedsoftdep = 1;
 	else
Index: sbin/fsdb/fsdb.c
===================================================================
--- sbin/fsdb/fsdb.c
+++ sbin/fsdb/fsdb.c
@@ -111,7 +111,6 @@
 		fsys = argv[0];
 
 	sblock_init();
-	bufinit();
 	if (!setup(fsys))
 		errx(1, "cannot set up file system `%s'", fsys);
 	if (fswritefd < 0)