From owner-freebsd-fs@FreeBSD.ORG Tue Aug 12 23:58:24 2008 Return-Path: Delivered-To: freebsd-fs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0A7A106566B for ; Tue, 12 Aug 2008 23:58:24 +0000 (UTC) (envelope-from matt@corp.spry.com) Received: from wf-out-1314.google.com (wf-out-1314.google.com [209.85.200.171]) by mx1.freebsd.org (Postfix) with ESMTP id 9DC1B8FC0A for ; Tue, 12 Aug 2008 23:58:24 +0000 (UTC) (envelope-from matt@corp.spry.com) Received: by wf-out-1314.google.com with SMTP id 24so2320086wfg.7 for ; Tue, 12 Aug 2008 16:58:24 -0700 (PDT) Received: by 10.142.163.13 with SMTP id l13mr2970558wfe.265.1218585503971; Tue, 12 Aug 2008 16:58:23 -0700 (PDT) Received: from matt.spry.com ( [207.178.4.6]) by mx.google.com with ESMTPS id 22sm4367301wfi.14.2008.08.12.16.58.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 12 Aug 2008 16:58:22 -0700 (PDT) Message-Id: <863C8170-8DCB-4BBD-9E18-CD03D59BC129@corp.spry.com> From: Matt Simerson To: freebsd-fs@freebsd.org Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v928.1) Date: Tue, 12 Aug 2008 16:58:04 -0700 X-Mailer: Apple Mail (2.928.1) Subject: ZFS patch against todays -HEAD X-BeenThere: freebsd-fs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Filesystems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Aug 2008 23:58:24 -0000 I applied the ZFS patch from http://people.freebsd.org/~pjd/patches/zfs_20080727.patch.bz2 to a copy of -HEAD checked out today and it fails as shown below. Any pointers on what needs to be tweaked to get past that? Matt cvsup /usr/local/etc/cvsup-head cd /usr/src patch -p0 < ~matt/zfs/zfs_20080727.patch rm /usr/src/sys/cddl/compat/opensolaris/sys/acl.h rm /usr/src/sys/cddl/compat/opensolaris/sys/callb.h cd /usr/src && make buildkernel KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common - finline-limit=8000 --param inline-unit-growth=100 --param large- function-growth=1000 -fno-omit-frame-pointer -mcmodel=kernel -mno-red- zone -mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow - msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fstack- protector -Werror /usr/src/sys/kern/kern_ntptime.c cc -c -O2 -frename-registers -pipe -fno-strict-aliasing -std=c99 -g - Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing- prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer- sign -fformat-extensions -nostdinc -I. -I/usr/src/sys -I/usr/src/sys/ contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit- growth=100 --param large-function-growth=1000 -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno- sse3 -mno-mmx -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fstack-protector -Werror /usr/src/sys/kern/kern_osd.c /usr/src/sys/kern/kern_osd.c:345: error: redefinition of 'M_OSD' /usr/src/sys/kern/kern_osd.c:44: error: previous definition of 'M_OSD' was here /usr/src/sys/kern/kern_osd.c:345: error: redefinition of 'M_OSD_init_sys_init' /usr/src/sys/kern/kern_osd.c:44: error: previous definition of 'M_OSD_init_sys_init' was here /usr/src/sys/kern/kern_osd.c:345: error: redefinition of '__set_sysinit_set_sym_M_OSD_init_sys_init' /usr/src/sys/kern/kern_osd.c:44: error: previous definition of '__set_sysinit_set_sym_M_OSD_init_sys_init' was here /usr/src/sys/kern/kern_osd.c:345: error: redefinition of 'M_OSD_uninit_sys_uninit' /usr/src/sys/kern/kern_osd.c:44: error: previous definition of 'M_OSD_uninit_sys_uninit' was here /usr/src/sys/kern/kern_osd.c:345: error: redefinition of '__set_sysuninit_set_sym_M_OSD_uninit_sys_uninit' /usr/src/sys/kern/kern_osd.c:44: error: previous definition of '__set_sysuninit_set_sym_M_OSD_uninit_sys_uninit' was here /usr/src/sys/kern/kern_osd.c:347: error: redefinition of 'osd_debug' /usr/src/sys/kern/kern_osd.c:46: error: previous definition of 'osd_debug' was here /usr/src/sys/kern/kern_osd.c:349: error: redefinition of 'sysctl___debug_osd' /usr/src/sys/kern/kern_osd.c:48: error: previous definition of 'sysctl___debug_osd' was here /usr/src/sys/kern/kern_osd.c:349: error: redefinition of '__set_sysctl_set_sym_sysctl___debug_osd' /usr/src/sys/kern/kern_osd.c:48: error: previous definition of '__set_sysctl_set_sym_sysctl___debug_osd' was here /usr/src/sys/kern/kern_osd.c:362: error: conflicting types for 'osd_list' /usr/src/sys/kern/kern_osd.c:61: error: previous declaration of 'osd_list' was here cc1: warnings being treated as errors /usr/src/sys/kern/kern_osd.c:363: warning: redundant redeclaration of 'osd_destructors' /usr/src/sys/kern/kern_osd.c:62: warning: previous declaration of 'osd_destructors' was here /usr/src/sys/kern/kern_osd.c:364: warning: redundant redeclaration of 'osd_nslots' /usr/src/sys/kern/kern_osd.c:63: warning: previous declaration of 'osd_nslots' was here /usr/src/sys/kern/kern_osd.c:365: warning: redundant redeclaration of 'osd_lock' /usr/src/sys/kern/kern_osd.c:64: warning: previous declaration of 'osd_lock' was here /usr/src/sys/kern/kern_osd.c:369: error: redefinition of 'osd_default_destructor' /usr/src/sys/kern/kern_osd.c:68: error: previous definition of 'osd_default_destructor' was here /usr/src/sys/kern/kern_osd.c:375: error: redefinition of 'osd_register' /usr/src/sys/kern/kern_osd.c:74: error: previous definition of 'osd_register' was here /usr/src/sys/kern/kern_osd.c:422: error: redefinition of 'osd_deregister' /usr/src/sys/kern/kern_osd.c:121: error: previous definition of 'osd_deregister' was here /usr/src/sys/kern/kern_osd.c:461: error: redefinition of 'osd_set' /usr/src/sys/kern/kern_osd.c:160: error: previous definition of 'osd_set' was here /usr/src/sys/kern/kern_osd.c:503: error: redefinition of 'osd_get' /usr/src/sys/kern/kern_osd.c:202: error: previous definition of 'osd_get' was here /usr/src/sys/kern/kern_osd.c:521: error: redefinition of 'osd_del' /usr/src/sys/kern/kern_osd.c:220: error: previous definition of 'osd_del' was here /usr/src/sys/kern/kern_osd.c:572: error: redefinition of 'osd_exit' /usr/src/sys/kern/kern_osd.c:271: error: previous definition of 'osd_exit' was here /usr/src/sys/kern/kern_osd.c:592: error: redefinition of 'osd_init' /usr/src/sys/kern/kern_osd.c:291: error: previous definition of 'osd_init' was here /usr/src/sys/kern/kern_osd.c:602: error: redefinition of 'osd_sys_init' /usr/src/sys/kern/kern_osd.c:301: error: previous definition of 'osd_sys_init' was here /usr/src/sys/kern/kern_osd.c:602: error: redefinition of '__set_sysinit_set_sym_osd_sys_init' /usr/src/sys/kern/kern_osd.c:301: error: previous definition of '__set_sysinit_set_sym_osd_sys_init' was here /usr/src/sys/kern/kern_osd.c:646: error: redefinition of 'M_OSD' /usr/src/sys/kern/kern_osd.c:345: error: previous definition of 'M_OSD' was here /usr/src/sys/kern/kern_osd.c:646: error: redefinition of 'M_OSD_init_sys_init' /usr/src/sys/kern/kern_osd.c:345: error: previous definition of 'M_OSD_init_sys_init' was here /usr/src/sys/kern/kern_osd.c:646: error: redefinition of '__set_sysinit_set_sym_M_OSD_init_sys_init' /usr/src/sys/kern/kern_osd.c:345: error: previous definition of '__set_sysinit_set_sym_M_OSD_init_sys_init' was here /usr/src/sys/kern/kern_osd.c:646: error: redefinition of 'M_OSD_uninit_sys_uninit' /usr/src/sys/kern/kern_osd.c:345: error: previous definition of 'M_OSD_uninit_sys_uninit' was here /usr/src/sys/kern/kern_osd.c:646: error: redefinition of '__set_sysuninit_set_sym_M_OSD_uninit_sys_uninit' /usr/src/sys/kern/kern_osd.c:345: error: previous definition of '__set_sysuninit_set_sym_M_OSD_uninit_sys_uninit' was here /usr/src/sys/kern/kern_osd.c:648: error: redefinition of 'osd_debug' /usr/src/sys/kern/kern_osd.c:347: error: previous definition of 'osd_debug' was here /usr/src/sys/kern/kern_osd.c:650: error: redefinition of 'sysctl___debug_osd' /usr/src/sys/kern/kern_osd.c:349: error: previous definition of 'sysctl___debug_osd' was here /usr/src/sys/kern/kern_osd.c:650: error: redefinition of '__set_sysctl_set_sym_sysctl___debug_osd' /usr/src/sys/kern/kern_osd.c:349: error: previous definition of '__set_sysctl_set_sym_sysctl___debug_osd' was here /usr/src/sys/kern/kern_osd.c:663: error: conflicting types for 'osd_list' /usr/src/sys/kern/kern_osd.c:362: error: previous declaration of 'osd_list' was here /usr/src/sys/kern/kern_osd.c:664: warning: redundant redeclaration of 'osd_destructors' /usr/src/sys/kern/kern_osd.c:363: warning: previous declaration of 'osd_destructors' was here /usr/src/sys/kern/kern_osd.c:665: warning: redundant redeclaration of 'osd_nslots' /usr/src/sys/kern/kern_osd.c:364: warning: previous declaration of 'osd_nslots' was here /usr/src/sys/kern/kern_osd.c:666: warning: redundant redeclaration of 'osd_lock' /usr/src/sys/kern/kern_osd.c:365: warning: previous declaration of 'osd_lock' was here /usr/src/sys/kern/kern_osd.c:670: error: redefinition of 'osd_default_destructor' /usr/src/sys/kern/kern_osd.c:369: error: previous definition of 'osd_default_destructor' was here /usr/src/sys/kern/kern_osd.c:676: error: redefinition of 'osd_register' /usr/src/sys/kern/kern_osd.c:74: error: previous definition of 'osd_register' was here /usr/src/sys/kern/kern_osd.c:723: error: redefinition of 'osd_deregister' /usr/src/sys/kern/kern_osd.c:121: error: previous definition of 'osd_deregister' was here /usr/src/sys/kern/kern_osd.c:762: error: redefinition of 'osd_set' /usr/src/sys/kern/kern_osd.c:160: error: previous definition of 'osd_set' was here /usr/src/sys/kern/kern_osd.c:804: error: redefinition of 'osd_get' /usr/src/sys/kern/kern_osd.c:202: error: previous definition of 'osd_get' was here /usr/src/sys/kern/kern_osd.c:822: error: redefinition of 'osd_del' /usr/src/sys/kern/kern_osd.c:220: error: previous definition of 'osd_del' was here /usr/src/sys/kern/kern_osd.c:873: error: redefinition of 'osd_exit' /usr/src/sys/kern/kern_osd.c:271: error: previous definition of 'osd_exit' was here /usr/src/sys/kern/kern_osd.c:893: error: redefinition of 'osd_init' /usr/src/sys/kern/kern_osd.c:592: error: previous definition of 'osd_init' was here /usr/src/sys/kern/kern_osd.c:903: error: redefinition of 'osd_sys_init' /usr/src/sys/kern/kern_osd.c:602: error: previous definition of 'osd_sys_init' was here /usr/src/sys/kern/kern_osd.c:903: error: redefinition of '__set_sysinit_set_sym_osd_sys_init' /usr/src/sys/kern/kern_osd.c:602: error: previous definition of '__set_sysinit_set_sym_osd_sys_init' was here *** Error code 1 Stop in /usr/obj/usr/src/sys/GENERIC. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src.