Date: Tue, 12 Jan 2010 12:51:47 +0800 From: "Wilkinson, Alex" <alex.wilkinson@dsto.defence.gov.au> To: freebsd-current@freebsd.org Subject: Re: Help test softupdates journaling (SUJ) [SEC=UNCLASSIFIED] Message-ID: <20100112045147.GA68439@stlux503.dsto.defence.gov.au> In-Reply-To: <alpine.BSF.2.00.1001081456000.1027@desktop> References: <alpine.BSF.2.00.1001081456000.1027@desktop>
next in thread | previous in thread | raw e-mail | index | archive | help
0n Fri, Jan 08, 2010 at 02:56:45PM -1000, Jeff Roberson wrote:
>To install you will need to apply http://people.freebsd.org/~jeff/suj.diff to a
I get the following with a buildworld after your patch:
cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/suj.c
In file included from /usr/src/sbin/fsck_ffs/suj.c:1982:
/usr/src/sbin/fsck_ffs/fsck.h:72: error: redefinition of 'union dinode'
/usr/src/sbin/fsck_ffs/fsck.h:94: error: redefinition of 'struct inostat'
/usr/src/sbin/fsck_ffs/fsck.h:121: error: redefinition of 'struct inostatlist'
/usr/src/sbin/fsck_ffs/fsck.h:129: error: redefinition of 'struct bufarea'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: nested redefinition of 'enum fixstate'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: redeclaration of 'enum fixstate'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: redeclaration of enumerator 'DONTKNOW'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: previous definition of 'DONTKNOW' was here
/usr/src/sbin/fsck_ffs/fsck.h:185: error: redeclaration of enumerator 'NOFIX'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: previous definition of 'NOFIX' was here
/usr/src/sbin/fsck_ffs/fsck.h:185: error: redeclaration of enumerator 'FIX'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: previous definition of 'FIX' was here
/usr/src/sbin/fsck_ffs/fsck.h:185: error: redeclaration of enumerator 'IGNORE'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: previous definition of 'IGNORE' was here
/usr/src/sbin/fsck_ffs/fsck.h:188: error: redefinition of 'struct inodesc'
/usr/src/sbin/fsck_ffs/fsck.h:230: error: redefinition of 'struct dups'
/usr/src/sbin/fsck_ffs/fsck.h:240: error: redefinition of 'struct inoinfo'
/usr/src/sbin/fsck_ffs/suj.c:1990: error: redefinition of 'struct suj_seg'
/usr/src/sbin/fsck_ffs/suj.c:1996: error: redefinition of 'struct suj_rec'
/usr/src/sbin/fsck_ffs/suj.c:2000: error: redefinition of 'struct srechd'
/usr/src/sbin/fsck_ffs/suj.c:2002: error: redefinition of 'struct suj_ino'
/usr/src/sbin/fsck_ffs/suj.c:2012: error: redefinition of 'struct inohd'
/usr/src/sbin/fsck_ffs/suj.c:2014: error: redefinition of 'struct suj_blk'
/usr/src/sbin/fsck_ffs/suj.c:2019: error: redefinition of 'struct blkhd'
/usr/src/sbin/fsck_ffs/suj.c:2021: error: redefinition of 'struct data_blk'
/usr/src/sbin/fsck_ffs/suj.c:2028: error: redefinition of 'struct ino_blk'
/usr/src/sbin/fsck_ffs/suj.c:2034: error: redefinition of 'struct iblkhd'
/usr/src/sbin/fsck_ffs/suj.c:2036: error: redefinition of 'struct suj_cg'
/usr/src/sbin/fsck_ffs/suj.c:2048: error: redefinition of 'struct cghd'
/usr/src/sbin/fsck_ffs/suj.c:2049: error: redefinition of 'struct dblkhd'
/usr/src/sbin/fsck_ffs/suj.c:2051: error: redefinition of 'struct seghd'
/usr/src/sbin/fsck_ffs/suj.c:2053: error: redefinition of 'disk'
/usr/src/sbin/fsck_ffs/suj.c:119: error: previous definition of 'disk' was here
/usr/src/sbin/fsck_ffs/suj.c:2054: error: redefinition of 'fs'
/usr/src/sbin/fsck_ffs/suj.c:120: error: previous definition of 'fs' was here
/usr/src/sbin/fsck_ffs/suj.c:2064: error: redefinition of typedef 'ino_visitor'
/usr/src/sbin/fsck_ffs/suj.c:130: error: previous declaration of 'ino_visitor' was here
/usr/src/sbin/fsck_ffs/suj.c:2068: error: redefinition of 'errmalloc'
/usr/src/sbin/fsck_ffs/suj.c:134: error: previous definition of 'errmalloc' was here
/usr/src/sbin/fsck_ffs/suj.c:2082: error: redefinition of 'opendisk'
/usr/src/sbin/fsck_ffs/suj.c:148: error: previous definition of 'opendisk' was here
/usr/src/sbin/fsck_ffs/suj.c:2106: error: redefinition of 'closedisk'
/usr/src/sbin/fsck_ffs/suj.c:172: error: previous definition of 'closedisk' was here
/usr/src/sbin/fsck_ffs/suj.c:2142: error: redefinition of 'cg_lookup'
/usr/src/sbin/fsck_ffs/suj.c:208: error: previous definition of 'cg_lookup' was here
/usr/src/sbin/fsck_ffs/suj.c:2173: error: redefinition of 'ino_lookup'
/usr/src/sbin/fsck_ffs/suj.c:239: error: previous definition of 'ino_lookup' was here
/usr/src/sbin/fsck_ffs/suj.c:2201: error: redefinition of 'blk_lookup'
/usr/src/sbin/fsck_ffs/suj.c:267: error: previous definition of 'blk_lookup' was here
/usr/src/sbin/fsck_ffs/suj.c:2224: error: redefinition of 'dblk_read'
/usr/src/sbin/fsck_ffs/suj.c:290: error: previous definition of 'dblk_read' was here
/usr/src/sbin/fsck_ffs/suj.c:2257: error: redefinition of 'ino_read'
/usr/src/sbin/fsck_ffs/suj.c:323: error: previous definition of 'ino_read' was here
/usr/src/sbin/fsck_ffs/suj.c:2291: error: redefinition of 'ino_dirty'
/usr/src/sbin/fsck_ffs/suj.c:357: error: previous definition of 'ino_dirty' was here
/usr/src/sbin/fsck_ffs/suj.c:2317: error: redefinition of 'iblk_write'
/usr/src/sbin/fsck_ffs/suj.c:383: error: previous definition of 'iblk_write' was here
/usr/src/sbin/fsck_ffs/suj.c:2331: error: redefinition of 'ino_isfree'
/usr/src/sbin/fsck_ffs/suj.c:397: error: previous definition of 'ino_isfree' was here
/usr/src/sbin/fsck_ffs/suj.c:2347: error: redefinition of 'blk_overlaps'
/usr/src/sbin/fsck_ffs/suj.c:413: error: previous definition of 'blk_overlaps' was here
/usr/src/sbin/fsck_ffs/suj.c:2363: error: redefinition of 'blk_equals'
/usr/src/sbin/fsck_ffs/suj.c:429: error: previous definition of 'blk_equals' was here
/usr/src/sbin/fsck_ffs/suj.c:2376: error: redefinition of 'blk_setmask'
/usr/src/sbin/fsck_ffs/suj.c:442: error: previous definition of 'blk_setmask' was here
/usr/src/sbin/fsck_ffs/suj.c:2393: error: redefinition of 'blk_isfree'
/usr/src/sbin/fsck_ffs/suj.c:459: error: previous definition of 'blk_isfree' was here
/usr/src/sbin/fsck_ffs/suj.c:2443: error: redefinition of 'blk_isindir'
/usr/src/sbin/fsck_ffs/suj.c:509: error: previous definition of 'blk_isindir' was here
/usr/src/sbin/fsck_ffs/suj.c:2465: error: redefinition of 'ino_free'
/usr/src/sbin/fsck_ffs/suj.c:531: error: previous definition of 'ino_free' was here
/usr/src/sbin/fsck_ffs/suj.c:2502: error: redefinition of 'blk_free'
/usr/src/sbin/fsck_ffs/suj.c:568: error: previous definition of 'blk_free' was here
/usr/src/sbin/fsck_ffs/suj.c:2546: error: redefinition of 'indir_blkatoff'
/usr/src/sbin/fsck_ffs/suj.c:612: error: previous definition of 'indir_blkatoff' was here
/usr/src/sbin/fsck_ffs/suj.c:2597: error: redefinition of 'ino_blkatoff'
/usr/src/sbin/fsck_ffs/suj.c:663: error: previous definition of 'ino_blkatoff' was here
/usr/src/sbin/fsck_ffs/suj.c:2654: error: redefinition of 'blk_isat'
/usr/src/sbin/fsck_ffs/suj.c:720: error: previous definition of 'blk_isat' was here
/usr/src/sbin/fsck_ffs/suj.c:2673: error: redefinition of 'ino_isat'
/usr/src/sbin/fsck_ffs/suj.c:739: error: previous definition of 'ino_isat' was here
/usr/src/sbin/fsck_ffs/suj.c:2766: error: redefinition of 'indir_visit'
/usr/src/sbin/fsck_ffs/suj.c:832: error: previous definition of 'indir_visit' was here
/usr/src/sbin/fsck_ffs/suj.c:2827: error: redefinition of 'ino_visit'
/usr/src/sbin/fsck_ffs/suj.c:893: error: previous definition of 'ino_visit' was here
/usr/src/sbin/fsck_ffs/suj.c:2877: error: redefinition of 'null_visit'
/usr/src/sbin/fsck_ffs/suj.c:943: error: previous definition of 'null_visit' was here
/usr/src/sbin/fsck_ffs/suj.c:2888: error: redefinition of 'ino_adjblks'
/usr/src/sbin/fsck_ffs/suj.c:954: error: previous definition of 'ino_adjblks' was here
/usr/src/sbin/fsck_ffs/suj.c:2915: error: redefinition of 'blk_free_visit'
/usr/src/sbin/fsck_ffs/suj.c:981: error: previous definition of 'blk_free_visit' was here
/usr/src/sbin/fsck_ffs/suj.c:2931: error: redefinition of 'blk_free_lbn'
/usr/src/sbin/fsck_ffs/suj.c:997: error: previous definition of 'blk_free_lbn' was here
/usr/src/sbin/fsck_ffs/suj.c:2947: error: redefinition of 'ino_free_children'
/usr/src/sbin/fsck_ffs/suj.c:1013: error: previous definition of 'ino_free_children' was here
/usr/src/sbin/fsck_ffs/suj.c:3019: error: redefinition of 'ino_truncate'
/usr/src/sbin/fsck_ffs/suj.c:1085: error: previous definition of 'ino_truncate' was here
/usr/src/sbin/fsck_ffs/suj.c:3057: error: redefinition of 'ino_decr'
/usr/src/sbin/fsck_ffs/suj.c:1123: error: previous definition of 'ino_decr' was here
/usr/src/sbin/fsck_ffs/suj.c:3092: error: redefinition of 'ino_adjust'
/usr/src/sbin/fsck_ffs/suj.c:1158: error: previous definition of 'ino_adjust' was here
/usr/src/sbin/fsck_ffs/suj.c:3143: error: redefinition of 'ino_check'
/usr/src/sbin/fsck_ffs/suj.c:1209: error: previous definition of 'ino_check' was here
/usr/src/sbin/fsck_ffs/suj.c:3229: error: redefinition of 'blk_check'
/usr/src/sbin/fsck_ffs/suj.c:1295: error: previous definition of 'blk_check' was here
/usr/src/sbin/fsck_ffs/suj.c:3287: error: redefinition of 'cg_check'
/usr/src/sbin/fsck_ffs/suj.c:1353: error: previous definition of 'cg_check' was here
/usr/src/sbin/fsck_ffs/suj.c:3313: error: redefinition of 'cg_write'
/usr/src/sbin/fsck_ffs/suj.c:1379: error: previous definition of 'cg_write' was here
/usr/src/sbin/fsck_ffs/suj.c:3367: error: redefinition of 'cg_apply'
/usr/src/sbin/fsck_ffs/suj.c:1433: error: previous definition of 'cg_apply' was here
/usr/src/sbin/fsck_ffs/suj.c:3384: error: redefinition of 'suj_build_ino'
/usr/src/sbin/fsck_ffs/suj.c:1450: error: previous definition of 'suj_build_ino' was here
/usr/src/sbin/fsck_ffs/suj.c:3420: error: redefinition of 'suj_move_ino'
/usr/src/sbin/fsck_ffs/suj.c:1486: error: previous definition of 'suj_move_ino' was here
/usr/src/sbin/fsck_ffs/suj.c:3458: error: redefinition of 'suj_build_blk'
/usr/src/sbin/fsck_ffs/suj.c:1524: error: previous definition of 'suj_build_blk' was here
/usr/src/sbin/fsck_ffs/suj.c:3511: error: redefinition of 'suj_build'
/usr/src/sbin/fsck_ffs/suj.c:1577: error: previous definition of 'suj_build' was here
/usr/src/sbin/fsck_ffs/suj.c:3551: error: redefinition of 'suj_prune'
/usr/src/sbin/fsck_ffs/suj.c:1617: error: previous definition of 'suj_prune' was here
/usr/src/sbin/fsck_ffs/suj.c:3612: error: redefinition of 'suj_verifyino'
/usr/src/sbin/fsck_ffs/suj.c:1678: error: previous definition of 'suj_verifyino' was here
/usr/src/sbin/fsck_ffs/suj.c:3631: error: redefinition of 'struct jblocks'
/usr/src/sbin/fsck_ffs/suj.c:3638: error: redefinition of 'struct jextent'
/usr/src/sbin/fsck_ffs/suj.c:3647: error: redefinition of 'jblocks_create'
/usr/src/sbin/fsck_ffs/suj.c:1713: error: previous definition of 'jblocks_create' was here
/usr/src/sbin/fsck_ffs/suj.c:3669: error: redefinition of 'jblocks_next'
/usr/src/sbin/fsck_ffs/suj.c:1735: error: previous definition of 'jblocks_next' was here
/usr/src/sbin/fsck_ffs/suj.c:3699: error: redefinition of 'jblocks_advance'
/usr/src/sbin/fsck_ffs/suj.c:1765: error: previous definition of 'jblocks_advance' was here
/usr/src/sbin/fsck_ffs/suj.c:3706: error: redefinition of 'jblocks_destroy'
/usr/src/sbin/fsck_ffs/suj.c:1772: error: previous definition of 'jblocks_destroy' was here
/usr/src/sbin/fsck_ffs/suj.c:3714: error: redefinition of 'jblocks_add'
/usr/src/sbin/fsck_ffs/suj.c:1780: error: previous definition of 'jblocks_add' was here
/usr/src/sbin/fsck_ffs/suj.c:3755: error: redefinition of 'suj_add_block'
/usr/src/sbin/fsck_ffs/suj.c:1821: error: previous definition of 'suj_add_block' was here
/usr/src/sbin/fsck_ffs/suj.c:3762: error: redefinition of 'suj_read'
/usr/src/sbin/fsck_ffs/suj.c:1828: error: previous definition of 'suj_read' was here
/usr/src/sbin/fsck_ffs/suj.c:3830: error: redefinition of 'suj_check'
/usr/src/sbin/fsck_ffs/suj.c:1896: error: previous definition of 'suj_check' was here
*** Error code 1
Stop in /usr/src/sbin/fsck_ffs.
*** Error code 1
Stop in /usr/obj/usr/src/rescue/rescue.
*** Error code 1
Stop in /usr/src/rescue/rescue.
*** Error code 1
Stop in /usr/src/rescue.
*** Error code 1
Stop in /usr/src.
*** Error code 1
Stop in /usr/src.
*** Error code 1
Stop in /usr/src.
Exit 1
IMPORTANT: This email remains the property of the Australian Defence Organisation and is subject to the jurisdiction of section 70 of the CRIMES ACT 1914. If you have received this email in error, you are requested to contact the sender and delete the email.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100112045147.GA68439>