From owner-freebsd-geom@FreeBSD.ORG  Fri Oct 20 17:59:09 2006
Return-Path: <owner-freebsd-geom@FreeBSD.ORG>
X-Original-To: freebsd-geom@freebsd.org
Delivered-To: freebsd-geom@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6458D16A416
	for <freebsd-geom@freebsd.org>; Fri, 20 Oct 2006 17:59:09 +0000 (UTC)
	(envelope-from antik@bsd.ee)
Received: from a5.virtuaal.com (a5.virtuaal.com [195.222.15.75])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8767243D5A
	for <freebsd-geom@freebsd.org>; Fri, 20 Oct 2006 17:58:50 +0000 (GMT)
	(envelope-from antik@bsd.ee)
Received: from pc122.host1.ida.starman.ee ([62.65.240.122]
	helo=[192.168.2.102])
	by a5.virtuaal.com with esmtpsa (SSLv3:AES256-SHA:256) (Exim 4.52)
	id 1Gayds-0000MR-7R
	for freebsd-geom@freebsd.org; Fri, 20 Oct 2006 20:58:48 +0300
From: Andrei Kolu <antik@bsd.ee>
To: freebsd-geom@freebsd.org
Date: Fri, 20 Oct 2006 20:54:48 -0700
User-Agent: KMail/1.9.4
MIME-Version: 1.0
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200610202054.49390.antik@bsd.ee>
X-AntiAbuse: This header was added to track abuse,
	please include it with any abuse report
X-AntiAbuse: Primary Hostname - a5.virtuaal.com
X-AntiAbuse: Original Domain - freebsd.org
X-AntiAbuse: Originator/Caller UID/GID - [0 0] / [47 12]
X-AntiAbuse: Sender Address Domain - bsd.ee
X-Source: 
X-Source-Args: 
X-Source-Dir: 
Subject: Gjournal on FreeBSD 6.1p10
X-BeenThere: freebsd-geom@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: GEOM-specific discussions and implementations
	<freebsd-geom.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-geom>,
	<mailto:freebsd-geom-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-geom>
List-Post: <mailto:freebsd-geom@freebsd.org>
List-Help: <mailto:freebsd-geom-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-geom>,
	<mailto:freebsd-geom-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Oct 2006 17:59:09 -0000

Hello!

I am trying to build PC-BSD 1.3 beta with gjournal patch, but build bombs out 
with error:

# cd /usr/src
# mkdir sys/geom/journal sbin/geom/class/journal sys/modules/geom/geom_journal
# patch < gjournal6_20061011.patch
# make buildkernel
.......................
/usr/src/sys/ufs/ufs/ufs_gjournal.c
/usr/src/sys/ufs/ufs/ufs_gjournal.c:206: error: redefinition 
of 'ufs_gjournal_modref'
/usr/src/sys/ufs/ufs/ufs_gjournal.c:56: error: previous definition 
of 'ufs_gjournal_modref' was here
/usr/src/sys/ufs/ufs/ufs_gjournal.c:259: error: redefinition 
of 'ufs_gjournal_orphan'
/usr/src/sys/ufs/ufs/ufs_gjournal.c:109: error: previous definition 
of 'ufs_gjournal_orphan' was here
/usr/src/sys/ufs/ufs/ufs_gjournal.c:285: error: redefinition 
of 'ufs_gjournal_close'
/usr/src/sys/ufs/ufs/ufs_gjournal.c:135: error: previous definition 
of 'ufs_gjournal_close' was here
*** Error code 1

Stop in /usr/obj/usr/src/sys/PCBSDv1.3GJ.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.