Gjournal on FreeBSD 6.1p10

[Andrei Kolu]

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.