Thu Oct 15 06:24:08 2015 UTC ()
For now bitflip the lfs64 magic number.

This will be unflipped when the format is finalized - right now I
still have pending changes to the superblock in mind (to reduce the
number of redundant fields) so anything created now is not future-
proof. However, the code's also nearing being ready for testing; so
I'm doing this before turning it on as a precaution.


(dholland)
diff -r1.195 -r1.196 src/sys/ufs/lfs/lfs.h
cvs diff -r1.195 -r1.196 src/sys/ufs/lfs/lfs.h (expand / switch to unified diff)

--- src/sys/ufs/lfs/lfs.h 2015/10/15 06:15:48 1.195
+++ src/sys/ufs/lfs/lfs.h 2015/10/15 06:24:08 1.196
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: lfs.h,v 1.195 2015/10/15 06:15:48 dholland Exp $ */ 1/* $NetBSD: lfs.h,v 1.196 2015/10/15 06:24:08 dholland Exp $ */
2 2
3/* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */ 3/* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */
4/* from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp */ 4/* from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp */
5 5
6/*- 6/*-
7 * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. 7 * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * 9 *
10 * This code is derived from software contributed to The NetBSD Foundation 10 * This code is derived from software contributed to The NetBSD Foundation
11 * by Konrad E. Schroder <perseant@hhhh.org>. 11 * by Konrad E. Schroder <perseant@hhhh.org>.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
14 * modification, are permitted provided that the following conditions 14 * modification, are permitted provided that the following conditions
@@ -766,28 +766,28 @@ union segsum { @@ -766,28 +766,28 @@ union segsum {
766 * 64-bit inode structure we got from ffsv2. 766 * 64-bit inode structure we got from ffsv2.
767 * 767 *
768 * In lfs64: 768 * In lfs64:
769 * - inode numbers are still 32 bit 769 * - inode numbers are still 32 bit
770 * - segments may not be larger than 4G (counted in bytes) 770 * - segments may not be larger than 4G (counted in bytes)
771 * - there may not be more than 2^32 (or perhaps 2^31) segments 771 * - there may not be more than 2^32 (or perhaps 2^31) segments
772 * - the total volume size is limited to 2^63 frags and/or 2^63 772 * - the total volume size is limited to 2^63 frags and/or 2^63
773 * disk blocks, and probably in practice 2^63 bytes. 773 * disk blocks, and probably in practice 2^63 bytes.
774 */ 774 */
775 775
776#define LFS_MAGIC 0x070162 776#define LFS_MAGIC 0x070162
777#define LFS_MAGIC_SWAPPED 0x62010700 777#define LFS_MAGIC_SWAPPED 0x62010700
778 778
779#define LFS64_MAGIC 0x19620701 779#define LFS64_MAGIC (0x19620701 ^ 0xffffffff)
780#define LFS64_MAGIC_SWAPPED 0x01076219 780#define LFS64_MAGIC_SWAPPED (0x01076219 ^ 0xffffffff)
781 781
782#define LFS_VERSION 2 782#define LFS_VERSION 2
783 783
784#define LFS_MIN_SBINTERVAL 5 /* min superblock segment spacing */ 784#define LFS_MIN_SBINTERVAL 5 /* min superblock segment spacing */
785#define LFS_MAXNUMSB 10 /* max number of superblocks */ 785#define LFS_MAXNUMSB 10 /* max number of superblocks */
786 786
787/* flags for dlfs_pflags */ 787/* flags for dlfs_pflags */
788#define LFS_PF_CLEAN 0x1 788#define LFS_PF_CLEAN 0x1
789 789
790/* Inode format versions */ 790/* Inode format versions */
791#define LFS_44INODEFMT 0 791#define LFS_44INODEFMT 0
792#define LFS_MAXINODEFMT 0 792#define LFS_MAXINODEFMT 0
793 793