*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)disklabel.c 5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)disklabel.c 5.18 (Berkeley) %G%";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
#include <sys/errno.h>
-#include <ufs/fs.h>
#include <sys/file.h>
#define DKTYPENAMES
#include <sys/disklabel.h>
+#include <ufs/ffs/fs.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
*/
#ifndef lint
-static char sccsid[] = "@(#)dir.c 5.19 (Berkeley) %G%";
+static char sccsid[] = "@(#)dir.c 5.20 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
#define KERNEL
-#include <ufs/dir.h>
+#include <ufs/ufs/dir.h>
#undef KERNEL
+#include <ufs/ffs/fs.h>
#include <stdlib.h>
#include <string.h>
#include "fsck.h"
*/
#ifndef lint
-static char sccsid[] = "@(#)inode.c 5.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)inode.c 5.19 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
-#include <ufs/dir.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>
#include <pwd.h>
#include <stdlib.h>
#include <string.h>
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)main.c 5.28 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c 5.29 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
#include <fstab.h>
#include <stdlib.h>
#include <string.h>
*/
#ifndef lint
-static char sccsid[] = "@(#)pass1.c 5.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass1.c 5.17 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
#include <stdlib.h>
#include <string.h>
#include "fsck.h"
*/
#ifndef lint
-static char sccsid[] = "@(#)pass1b.c 5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass1b.c 5.9 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
#include <string.h>
#include "fsck.h"
*/
#ifndef lint
-static char sccsid[] = "@(#)pass2.c 5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass2.c 5.18 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
#define KERNEL
-#include <ufs/dir.h>
+#include <ufs/ufs/dir.h>
#undef KERNEL
+#include <ufs/ffs/fs.h>
#include <stdlib.h>
#include <string.h>
#include "fsck.h"
*/
#ifndef lint
-static char sccsid[] = "@(#)pass3.c 5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass3.c 5.11 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
#include "fsck.h"
pass3()
*/
#ifndef lint
-static char sccsid[] = "@(#)pass4.c 5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass4.c 5.11 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
#include <stdlib.h>
#include <string.h>
#include "fsck.h"
*/
#ifndef lint
-static char sccsid[] = "@(#)pass5.c 5.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass5.c 5.14 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
#include <string.h>
#include "fsck.h"
*/
#ifndef lint
-static char sccsid[] = "@(#)setup.c 5.33 (Berkeley) %G%";
+static char sccsid[] = "@(#)setup.c 5.34 (Berkeley) %G%";
#endif /* not lint */
#define DKTYPENAMES
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/disklabel.h>
*/
#ifndef lint
-static char sccsid[] = "@(#)utilities.c 5.30 (Berkeley) %G%";
+static char sccsid[] = "@(#)utilities.c 5.31 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
-#include <ufs/dir.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
*/
#ifndef lint
-static char sccsid[] = "@(#)mkfs.c 6.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)mkfs.c 6.19 (Berkeley) %G%";
#endif /* not lint */
#ifndef STANDALONE
#include <sys/time.h>
#include <sys/wait.h>
#include <sys/resource.h>
-#include <ufs/dinode.h>
-#include <ufs/fs.h>
-#include <ufs/dir.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>
#include <sys/disklabel.h>
-#include <machine/endian.h>
/*
* make file system for cylinder-group style file systems
*/
#ifndef lint
-static char sccsid[] = "@(#)newfs.c 6.28 (Berkeley) %G%";
+static char sccsid[] = "@(#)newfs.c 6.29 (Berkeley) %G%";
#endif /* not lint */
#ifndef lint
*/
#include <sys/param.h>
#include <sys/stat.h>
-#include <ufs/fs.h>
-#include <ufs/dir.h>
#include <sys/ioctl.h>
#include <sys/disklabel.h>
#include <sys/file.h>
#include <sys/mount.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>
#include <errno.h>
#if __STDC__