Gjournal on FreeBSD 6.1p10

[Andrei Kolu]

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.