From owner-freebsd-geom@FreeBSD.ORG Fri Oct 20 20:27:43 2006 Return-Path: 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 4432416A4CE for ; Fri, 20 Oct 2006 20:27:43 +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 97EA343F80 for ; Fri, 20 Oct 2006 20:20:06 +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 1Gb0qQ-0000gf-VT for freebsd-geom@freebsd.org; Fri, 20 Oct 2006 23:19:55 +0300 From: Andrei Kolu To: freebsd-geom@freebsd.org Date: Fri, 20 Oct 2006 23:19:52 -0700 User-Agent: KMail/1.9.4 References: <200610202054.49390.antik@bsd.ee> <20061020183104.GB56628@garage.freebsd.pl> In-Reply-To: <20061020183104.GB56628@garage.freebsd.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200610202319.53110.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: Re: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Oct 2006 20:27:43 -0000 On Friday 20 October 2006 11:31 am, you wrote: > On Fri, Oct 20, 2006 at 08:54:48PM -0700, Andrei Kolu wrote: > > 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 > > It looks that you patched your source twice. Maybe, I resynced source with csup after unsuccessful patch (I forgot to make directories) but maybe I left some files from older sync... ------------------------------------------- Patching file sys/ufs/ufs/ufs_inode.c using Plan A... Hunk #1 succeeded at 57. Hunk #2 failed at 86. 1 out of 2 hunks failed--saving rejects to sys/ufs/ufs/ufs_inode.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys/ufs/ufs/ufs_vnops.c.orig |+++ sys/ufs/ufs/ufs_vnops.c -------------------------- Patching file sys/ufs/ufs/ufs_vnops.c using Plan A... Hunk #1 succeeded at 81. Hunk #2 succeeded at 767 (offset -13 lines). Hunk #3 succeeded at 1676 (offset -13 lines). ------------------------------------------- I am sure I deleted whole /usr/src/sys directory and resynced it.