Re: Help test softupdates journaling (SUJ)

From: Jeff Roberson <jroberson_at_jroberson.net>
Date: Sun, 10 Jan 2010 13:13:08 -1000 (HST)
On Sun, 10 Jan 2010, Dmitriy Demidov wrote:

> On Sunday 10 January 2010, pluknet wrote:
>> After looking on line numbers I'd suggest you to check
>> if you've applied the patch two times (so suj.c "duplicates" itself).
>>
>
> Unfortunately - no luck for me...
> After removing all data from /usr/src + /usr/obj, and csup'ing fresh copy of CURRENT from cvsup.lv.freebsd.org, I still have buildworld erros:

For some reason I see this ino_isfree error but it does not quit the 
build.  You can comment out ino_isfree and it will proceed.  I received 
another email mentioning that dumpfs perhaps doesn't build so buildworld 
may be a bad idea.  Just make fsck_ffs, tunefs, and a kernel and you'll be 
set.

Thanks,
Jeff

>
>
> ==
> (cd /usr/src/rescue/rescue/../../sbin/atacontrol &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/atacontrol/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/atacontrol/ atacontrol.o)
> rm -f .depend
> mkdep -f .depend -a    -DRESCUE /usr/src/sbin/atacontrol/atacontrol.c
> echo atacontrol: /usr/obj/usr/src/tmp/usr/lib/libc.a  >> .depend
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -c /usr/src/sbin/atacontrol/atacontrol.c
> (cd /usr/src/rescue/rescue/../../sbin/badsect &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/badsect/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/badsect/ badsect.o)
> rm -f .depend
> mkdep -f .depend -a    -DRESCUE /usr/src/sbin/badsect/badsect.c
> echo badsect: /usr/obj/usr/src/tmp/usr/lib/libc.a /usr/obj/usr/src/tmp/usr/lib/libufs.a >> .depend
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/badsect/badsect.c
> (cd /usr/src/rescue/rescue/../../sbin/camcontrol &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/camcontrol/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/camcontrol/ camcontrol.o util.o modeedit.o)
> rm -f .depend
> mkdep -f .depend -a    -DRESCUE /usr/src/sbin/camcontrol/camcontrol.c /usr/src/sbin/camcontrol/util.c /usr/src/sbin/camcontrol/modeedit.c
> echo camcontrol: /usr/obj/usr/src/tmp/usr/lib/libc.a /usr/obj/usr/src/tmp/usr/lib/libcam.a /usr/obj/usr/src/tmp/usr/lib/libsbuf.a /usr/obj/usr/src/tmp/usr/lib/libutil.a >> .depend
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -c /usr/src/sbin/camcontrol/camcontrol.c
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -c /usr/src/sbin/camcontrol/util.c
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -c /usr/src/sbin/camcontrol/modeedit.c
> (cd /usr/src/rescue/rescue/../../sbin/ccdconfig &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/ccdconfig/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/ccdconfig/ ccdconfig.o)
> rm -f .depend
> mkdep -f .depend -a    -DRESCUE /usr/src/sbin/ccdconfig/ccdconfig.c
> echo ccdconfig: /usr/obj/usr/src/tmp/usr/lib/libc.a /usr/obj/usr/src/tmp/usr/lib/libgeom.a >> .depend
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -c /usr/src/sbin/ccdconfig/ccdconfig.c
> (cd /usr/src/rescue/rescue/../../sbin/clri &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/clri/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/clri/ clri.o)
> rm -f .depend
> mkdep -f .depend -a    -DRESCUE /usr/src/sbin/clri/clri.c
> echo clri: /usr/obj/usr/src/tmp/usr/lib/libc.a  >> .depend
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/clri/clri.c
> (cd /usr/src/rescue/rescue/../../sbin/devfs &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/devfs/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/devfs/ devfs.o rule.o)
> rm -f .depend
> mkdep -f .depend -a    -DRESCUE /usr/src/sbin/devfs/devfs.c /usr/src/sbin/devfs/rule.c
> echo devfs: /usr/obj/usr/src/tmp/usr/lib/libc.a  >> .depend
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wno-pointer-sign -c /usr/src/sbin/devfs/devfs.c
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wno-pointer-sign -c /usr/src/sbin/devfs/rule.c
> (cd /usr/src/rescue/rescue/../../sbin/dmesg &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/dmesg/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/dmesg/ dmesg.o)
> rm -f .depend
> mkdep -f .depend -a    -DRESCUE /usr/src/sbin/dmesg/dmesg.c
> echo dmesg: /usr/obj/usr/src/tmp/usr/lib/libc.a /usr/obj/usr/src/tmp/usr/lib/libkvm.a >> .depend
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -c /usr/src/sbin/dmesg/dmesg.c
> (cd /usr/src/rescue/rescue/../../sbin/dump &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/dump/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/dump/ itime.o main.o optr.o dumprmt.o tape.o traverse.o unctime.o cache.o)
> rm -f .depend
> mkdep -f .depend -a    -DRDUMP -DRESCUE /usr/src/sbin/dump/itime.c /usr/src/sbin/dump/main.c /usr/src/sbin/dump/optr.c /usr/src/sbin/dump/dumprmt.c /usr/src/sbin/dump/tape.c /usr/src/sbin/dump/traverse.c /usr/src/sbin/dump/unctime.c /usr/src/sbin/dump/cache.c
> echo dump: /usr/obj/usr/src/tmp/usr/lib/libc.a  >> .depend
> cc -O2 -pipe  -DRDUMP -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/dump/itime.c
> cc -O2 -pipe  -DRDUMP -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/dump/main.c
> cc -O2 -pipe  -DRDUMP -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/dump/optr.c
> cc -O2 -pipe  -DRDUMP -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/dump/dumprmt.c
> cc -O2 -pipe  -DRDUMP -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/dump/tape.c
> cc -O2 -pipe  -DRDUMP -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/dump/traverse.c
> cc -O2 -pipe  -DRDUMP -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/dump/unctime.c
> cc -O2 -pipe  -DRDUMP -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/dump/cache.c
> (cd /usr/src/rescue/rescue/../../sbin/dumpfs &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/dumpfs/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/dumpfs/ dumpfs.o)
> rm -f .depend
> mkdep -f .depend -a    -DRESCUE /usr/src/sbin/dumpfs/dumpfs.c
> echo dumpfs: /usr/obj/usr/src/tmp/usr/lib/libc.a /usr/obj/usr/src/tmp/usr/lib/libufs.a >> .depend
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/dumpfs/dumpfs.c
> (cd /usr/src/rescue/rescue/../../sbin/dumpon &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/dumpon/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/dumpon/ dumpon.o)
> rm -f .depend
> mkdep -f .depend -a    -DRESCUE /usr/src/sbin/dumpon/dumpon.c
> echo dumpon: /usr/obj/usr/src/tmp/usr/lib/libc.a  >> .depend
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wold-style-definition -Wno-pointer-sign -c /usr/src/sbin/dumpon/dumpon.c
> (cd /usr/src/rescue/rescue/../../sbin/fsck &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/fsck/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/fsck/ fsck.o fsutil.o preen.o)
> rm -f .depend
> mkdep -f .depend -a    -DRESCUE /usr/src/sbin/fsck/fsck.c /usr/src/sbin/fsck/fsutil.c /usr/src/sbin/fsck/preen.c
> echo fsck: /usr/obj/usr/src/tmp/usr/lib/libc.a  >> .depend
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck/fsck.c
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck/fsutil.c
> cc -O2 -pipe  -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck/preen.c
> (cd /usr/src/rescue/rescue/../../sbin/fsck_ffs &&  make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/fsck_ffs/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE DIRPRFX=rescue/rescue/fsck_ffs/ dir.o ea.o fsutil.o inode.o main.o pass1.o pass1b.o pass2.o pass3.o pass4.o pass5.o setup.o suj.o utilities.o gjournal.o getmntopts.o)
> rm -f .depend
> mkdep -f .depend -a    -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -DRESCUE /usr/src/sbin/fsck_ffs/dir.c /usr/src/sbin/fsck_ffs/ea.c /usr/src/sbin/fsck_ffs/fsutil.c /usr/src/sbin/fsck_ffs/inode.c /usr/src/sbin/fsck_ffs/main.c /usr/src/sbin/fsck_ffs/pass1.c /usr/src/sbin/fsck_ffs/pass1b.c /usr/src/sbin/fsck_ffs/pass2.c /usr/src/sbin/fsck_ffs/pass3.c /usr/src/sbin/fsck_ffs/pass4.c /usr/src/sbin/fsck_ffs/pass5.c /usr/src/sbin/fsck_ffs/setup.c /usr/src/sbin/fsck_ffs/suj.c /usr/src/sbin/fsck_ffs/utilities.c /usr/src/sbin/fsck_ffs/gjournal.c /usr/src/sbin/fsck_ffs/../mount/getmntopts.c
> echo fsck_ffs: /usr/obj/usr/src/tmp/usr/lib/libc.a /usr/obj/usr/src/tmp/usr/lib/libufs.a >> .depend
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/dir.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/ea.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/fsutil.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/inode.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/main.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/pass1.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/pass1b.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/pass2.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/pass3.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/pass4.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/pass5.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/setup.c
> cc -O0 -pipe -I/usr/src/sbin/fsck_ffs -I/usr/src/sbin/fsck_ffs/../mount -g -DRESCUE -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/fsck_ffs/suj.c
> cc1: warnings being treated as errors
> /usr/src/sbin/fsck_ffs/suj.c:397: warning: 'ino_isfree' defined but not used
> *** Error code 1
>
> Stop in /usr/src/sbin/fsck_ffs.
> *** Error code 1
>
> Stop in /usr/obj/usr/src/rescue/rescue.
> *** Error code 1
>
> Stop in /usr/src/rescue/rescue.
> *** Error code 1
>
> Stop in /usr/src/rescue.
> *** Error code 1
>
> Stop in /usr/src.
> *** Error code 1
>
> Stop in /usr/src.
> *** Error code 1
>
> Stop in /usr/src.
>
> ==
>
>
>
>
>
> Here is a log of patching:
>
> ==
>
> Script started on Sun Jan 10 16:21:26 2010
> evo#
> evo# patch < /home/terminus/suj.diff
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sbin/fsck_ffs/suj.c
> |===================================================================
> |--- sbin/fsck_ffs/suj.c        (revision 0)
> |+++ sbin/fsck_ffs/suj.c        (revision 0)
> --------------------------
> (Creating file sbin/fsck_ffs/suj.c...)
> Patching file sbin/fsck_ffs/suj.c using Plan A...
> Hunk #1 succeeded at 1.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sbin/fsck_ffs/gjournal.c
> |===================================================================
> |--- sbin/fsck_ffs/gjournal.c   (revision 201766)
> |+++ sbin/fsck_ffs/gjournal.c   (working copy)
> --------------------------
> Patching file sbin/fsck_ffs/gjournal.c using Plan A...
> Hunk #1 succeeded at 96.
> Hunk #2 succeeded at 221.
> Hunk #3 succeeded at 236.
> Hunk #4 succeeded at 245.
> Hunk #5 succeeded at 255.
> Hunk #6 succeeded at 272.
> Hunk #7 succeeded at 285.
> Hunk #8 succeeded at 302.
> Hunk #9 succeeded at 332.
> Hunk #10 succeeded at 404.
> Hunk #11 succeeded at 480.
> Hunk #12 succeeded at 505.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sbin/fsck_ffs/main.c
> |===================================================================
> |--- sbin/fsck_ffs/main.c       (revision 201766)
> |+++ sbin/fsck_ffs/main.c       (working copy)
> --------------------------
> Patching file sbin/fsck_ffs/main.c using Plan A...
> Hunk #1 succeeded at 256.
> Hunk #2 succeeded at 278.
> Hunk #3 succeeded at 311.
> Hunk #4 succeeded at 493.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sbin/fsck_ffs/pass4.c
> |===================================================================
> |--- sbin/fsck_ffs/pass4.c      (revision 201766)
> |+++ sbin/fsck_ffs/pass4.c      (working copy)
> --------------------------
> Patching file sbin/fsck_ffs/pass4.c using Plan A...
> Hunk #1 succeeded at 72.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sbin/fsck_ffs/pass5.c
> |===================================================================
> |--- sbin/fsck_ffs/pass5.c      (revision 201766)
> |+++ sbin/fsck_ffs/pass5.c      (working copy)
> --------------------------
> Patching file sbin/fsck_ffs/pass5.c using Plan A...
> Hunk #1 succeeded at 45.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sbin/fsck_ffs/fsck.h
> |===================================================================
> |--- sbin/fsck_ffs/fsck.h       (revision 201766)
> |+++ sbin/fsck_ffs/fsck.h       (working copy)
> --------------------------
> Patching file sbin/fsck_ffs/fsck.h using Plan A...
> Hunk #1 succeeded at 347.
> Hunk #2 succeeded at 388.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sbin/fsck_ffs/Makefile
> |===================================================================
> |--- sbin/fsck_ffs/Makefile     (revision 201766)
> |+++ sbin/fsck_ffs/Makefile     (working copy)
> --------------------------
> Patching file sbin/fsck_ffs/Makefile using Plan A...
> Hunk #1 succeeded at 7.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sbin/fsdb/fsdbutil.c
> |===================================================================
> |--- sbin/fsdb/fsdbutil.c       (revision 201766)
> |+++ sbin/fsdb/fsdbutil.c       (working copy)
> --------------------------
> Patching file sbin/fsdb/fsdbutil.c using Plan A...
> Hunk #1 succeeded at 52.
> Hunk #2 succeeded at 226.
> Hunk #3 succeeded at 234.
> Hunk #4 succeeded at 254.
> Hunk #5 succeeded at 270.
> Hunk #6 succeeded at 310.
> Hunk #7 succeeded at 318.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sbin/tunefs/tunefs.c
> |===================================================================
> |--- sbin/tunefs/tunefs.c       (revision 201766)
> |+++ sbin/tunefs/tunefs.c       (working copy)
> --------------------------
> Patching file sbin/tunefs/tunefs.c using Plan A...
> Hunk #1 succeeded at 61.
> Hunk #2 succeeded at 73.
> Hunk #3 succeeded at 93.
> Hunk #4 succeeded at 137.
> Hunk #5 succeeded at 254.
> Hunk #6 succeeded at 334.
> Hunk #7 succeeded at 507.
> Hunk #8 succeeded at 751.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: lib/libufs/inode.c
> |===================================================================
> |--- lib/libufs/inode.c (revision 201766)
> |+++ lib/libufs/inode.c (working copy)
> --------------------------
> Patching file lib/libufs/inode.c using Plan A...
> Hunk #1 succeeded at 93.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: lib/libufs/cgroup.c
> |===================================================================
> |--- lib/libufs/cgroup.c        (revision 201766)
> |+++ lib/libufs/cgroup.c        (working copy)
> --------------------------
> Patching file lib/libufs/cgroup.c using Plan A...
> Hunk #1 succeeded at 40.
> Hunk #2 succeeded at 126.
> Hunk #3 succeeded at 142.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: lib/libufs/type.c
> |===================================================================
> |--- lib/libufs/type.c  (revision 201766)
> |+++ lib/libufs/type.c  (working copy)
> --------------------------
> Patching file lib/libufs/type.c using Plan A...
> Hunk #1 succeeded at 66.
> Hunk #2 succeeded at 160.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: lib/libufs/libufs.h
> |===================================================================
> |--- lib/libufs/libufs.h        (revision 201766)
> |+++ lib/libufs/libufs.h        (working copy)
> --------------------------
> Patching file lib/libufs/libufs.h using Plan A...
> Hunk #1 succeeded at 71.
> Hunk #2 succeeded at 110.
> Hunk #3 succeeded at 137.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: lib/libufs/Makefile
> |===================================================================
> |--- lib/libufs/Makefile        (revision 201766)
> |+++ lib/libufs/Makefile        (working copy)
> --------------------------
> Patching file lib/libufs/Makefile using Plan A...
> Hunk #1 succeeded at 3.
> Hunk #2 succeeded at 16.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: lib/libufs/sblock.c
> |===================================================================
> |--- lib/libufs/sblock.c        (revision 201766)
> |+++ lib/libufs/sblock.c        (working copy)
> --------------------------
> Patching file lib/libufs/sblock.c using Plan A...
> Hunk #1 succeeded at 40.
> Hunk #2 succeeded at 50.
> Hunk #3 succeeded at 90.
> Hunk #4 succeeded at 125.
> Hunk #5 succeeded at 140.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ufs/ufs_dirhash.c
> |===================================================================
> |--- sys/ufs/ufs/ufs_dirhash.c  (revision 201766)
> |+++ sys/ufs/ufs/ufs_dirhash.c  (working copy)
> --------------------------
> Patching file sys/ufs/ufs/ufs_dirhash.c using Plan A...
> Hunk #1 succeeded at 68.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ufs/ufs_vnops.c
> |===================================================================
> |--- sys/ufs/ufs/ufs_vnops.c    (revision 201766)
> |+++ sys/ufs/ufs/ufs_vnops.c    (working copy)
> --------------------------
> Patching file sys/ufs/ufs/ufs_vnops.c using Plan A...
> Hunk #1 succeeded at 114.
> Hunk #2 succeeded at 976.
> Hunk #3 succeeded at 993.
> Hunk #4 succeeded at 1006.
> Hunk #5 succeeded at 1048.
> Hunk #6 succeeded at 1067.
> Hunk #7 succeeded at 1111.
> Hunk #8 succeeded at 1296.
> Hunk #9 succeeded at 1390.
> Hunk #10 succeeded at 1401.
> Hunk #11 succeeded at 1416.
> Hunk #12 succeeded at 1444.
> Hunk #13 succeeded at 1741.
> Hunk #14 succeeded at 1757.
> Hunk #15 succeeded at 1867.
> Hunk #16 succeeded at 1883.
> Hunk #17 succeeded at 1892.
> Hunk #18 succeeded at 1929.
> Hunk #19 succeeded at 1959.
> Hunk #20 succeeded at 2475.
> Hunk #21 succeeded at 2607.
> Hunk #22 succeeded at 2671.
> Hunk #23 succeeded at 2687.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ufs/ufsmount.h
> |===================================================================
> |--- sys/ufs/ufs/ufsmount.h     (revision 201766)
> |+++ sys/ufs/ufs/ufsmount.h     (working copy)
> --------------------------
> Patching file sys/ufs/ufs/ufsmount.h using Plan A...
> Hunk #1 succeeded at 57.
> Hunk #2 succeeded at 76.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ufs/ufs_lookup.c
> |===================================================================
> |--- sys/ufs/ufs/ufs_lookup.c   (revision 201766)
> |+++ sys/ufs/ufs/ufs_lookup.c   (working copy)
> --------------------------
> Patching file sys/ufs/ufs/ufs_lookup.c using Plan A...
> Hunk #1 succeeded at 77.
> Hunk #2 succeeded at 186.
> Hunk #3 succeeded at 521.
> Hunk #4 succeeded at 545.
> Hunk #5 succeeded at 552.
> Hunk #6 succeeded at 568.
> Hunk #7 succeeded at 609.
> Hunk #8 succeeded at 645.
> Hunk #9 succeeded at 678.
> Hunk #10 succeeded at 822.
> Hunk #11 succeeded at 900.
> Hunk #12 succeeded at 988.
> Hunk #13 succeeded at 1040.
> Hunk #14 succeeded at 1059.
> Hunk #15 succeeded at 1101.
> Hunk #16 succeeded at 1143.
> Hunk #17 succeeded at 1164.
> Hunk #18 succeeded at 1210.
> Hunk #19 succeeded at 1347.
> Hunk #20 succeeded at 1376.
> Hunk #21 succeeded at 1394.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ufs/ufs_extern.h
> |===================================================================
> |--- sys/ufs/ufs/ufs_extern.h   (revision 201766)
> |+++ sys/ufs/ufs/ufs_extern.h   (working copy)
> --------------------------
> Patching file sys/ufs/ufs/ufs_extern.h using Plan A...
> Hunk #1 succeeded at 57.
> Hunk #2 succeeded at 66.
> Hunk #3 succeeded at 83.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ffs/ffs_vfsops.c
> |===================================================================
> |--- sys/ufs/ffs/ffs_vfsops.c   (revision 201766)
> |+++ sys/ufs/ffs/ffs_vfsops.c   (working copy)
> --------------------------
> Patching file sys/ufs/ffs/ffs_vfsops.c using Plan A...
> Hunk #1 succeeded at 331.
> Hunk #2 succeeded at 899.
> Hunk #3 succeeded at 911.
> Hunk #4 succeeded at 942.
> Hunk #5 succeeded at 1871.
> Hunk #6 succeeded at 1911.
> Hunk #7 succeeded at 1933.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ffs/ffs_softdep.c
> |===================================================================
> |--- sys/ufs/ffs/ffs_softdep.c  (revision 201766)
> |+++ sys/ufs/ffs/ffs_softdep.c  (working copy)
> --------------------------
> Patching file sys/ufs/ffs/ffs_softdep.c using Plan A...
> Hunk #1 succeeded at 62.
> Hunk #2 succeeded at 131.
> Hunk #3 succeeded at 406.
> Hunk #4 succeeded at 423.
> Hunk #5 succeeded at 488.
> Hunk #6 succeeded at 499.
> Hunk #7 succeeded at 518.
> Hunk #8 succeeded at 544.
> Hunk #9 succeeded at 715.
> Hunk #10 succeeded at 854.
> Hunk #11 succeeded at 877.
> Hunk #12 succeeded at 932.
> Hunk #13 succeeded at 1009.
> Hunk #14 succeeded at 1036.
> Hunk #15 succeeded at 1054.
> Hunk #16 succeeded at 1109.
> Hunk #17 succeeded at 1143.
> Hunk #18 succeeded at 1205.
> Hunk #19 succeeded at 1225.
> Hunk #20 succeeded at 1241.
> Hunk #21 succeeded at 1252.
> Hunk #22 succeeded at 1262.
> Hunk #23 succeeded at 1281.
> Hunk #24 succeeded at 1299.
> Hunk #25 succeeded at 1322.
> Hunk #26 succeeded at 1520.
> Hunk #27 succeeded at 1543.
> Hunk #28 succeeded at 1595.
> Hunk #29 succeeded at 1606.
> Hunk #30 succeeded at 1636.
> Hunk #31 succeeded at 1665.
> Hunk #32 succeeded at 1702.
> Hunk #33 succeeded at 1711.
> Hunk #34 succeeded at 1746.
> Hunk #35 succeeded at 1773.
> Hunk #36 succeeded at 1803.
> Hunk #37 succeeded at 1844.
> Hunk #38 succeeded at 3618.
> Hunk #39 succeeded at 3652.
> Hunk #40 succeeded at 3670.
> Hunk #41 succeeded at 3742.
> Hunk #42 succeeded at 3813.
> Hunk #43 succeeded at 3826.
> Hunk #44 succeeded at 3853.
> Hunk #45 succeeded at 3902.
> Hunk #46 succeeded at 3938.
> Hunk #47 succeeded at 3957.
> Hunk #48 succeeded at 3966.
> Hunk #49 succeeded at 3982.
> Hunk #50 succeeded at 4100.
> Hunk #51 succeeded at 4133.
> Hunk #52 succeeded at 4196.
> Hunk #53 succeeded at 4246.
> Hunk #54 succeeded at 4288.
> Hunk #55 succeeded at 4326.
> Hunk #56 succeeded at 4405.
> Hunk #57 succeeded at 4466.
> Hunk #58 succeeded at 4490.
> Hunk #59 succeeded at 4571.
> Hunk #60 succeeded at 4579.
> Hunk #61 succeeded at 4594.
> Hunk #62 succeeded at 4655.
> Hunk #63 succeeded at 4694.
> Hunk #64 succeeded at 4707.
> Hunk #65 succeeded at 4723.
> Hunk #66 succeeded at 4758.
> Hunk #67 succeeded at 4781.
> Hunk #68 succeeded at 4799.
> Hunk #69 succeeded at 4824.
> Hunk #70 succeeded at 4849.
> Hunk #71 succeeded at 4904.
> Hunk #72 succeeded at 5065.
> Hunk #73 succeeded at 5083.
> Hunk #74 succeeded at 5128.
> Hunk #75 succeeded at 5139.
> Hunk #76 succeeded at 5189.
> Hunk #77 succeeded at 5198.
> Hunk #78 succeeded at 5209.
> Hunk #79 succeeded at 5236.
> Hunk #80 succeeded at 5258.
> Hunk #81 succeeded at 5387.
> Hunk #82 succeeded at 5471.
> Hunk #83 succeeded at 5528.
> Hunk #84 succeeded at 5544.
> Hunk #85 succeeded at 5560.
> Hunk #86 succeeded at 5825.
> Hunk #87 succeeded at 5842.
> Hunk #88 succeeded at 5853.
> Hunk #89 succeeded at 5954.
> Hunk #90 succeeded at 5964.
> Hunk #91 succeeded at 6161.
> Hunk #92 succeeded at 6200.
> Hunk #93 succeeded at 6275.
> Hunk #94 succeeded at 6297.
> Hunk #95 succeeded at 6368.
> Hunk #96 succeeded at 6396.
> Hunk #97 succeeded at 6441.
> Hunk #98 succeeded at 6457.
> Hunk #99 succeeded at 6490.
> Hunk #100 succeeded at 6528.
> Hunk #101 succeeded at 6568.
> Hunk #102 succeeded at 6611.
> Hunk #103 succeeded at 6637.
> Hunk #104 succeeded at 6705.
> Hunk #105 succeeded at 6735.
> Hunk #106 succeeded at 6797.
> Hunk #107 succeeded at 6807.
> Hunk #108 succeeded at 6869.
> Hunk #109 succeeded at 6881.
> Hunk #110 succeeded at 6910.
> Hunk #111 succeeded at 6981.
> Hunk #112 succeeded at 6998.
> Hunk #113 succeeded at 7046.
> Hunk #114 succeeded at 7082.
> Hunk #115 succeeded at 7137.
> Hunk #116 succeeded at 7168.
> Hunk #117 succeeded at 7186.
> Hunk #118 succeeded at 7207.
> Hunk #119 succeeded at 7244.
> Hunk #120 succeeded at 7291.
> Hunk #121 succeeded at 7313.
> Hunk #122 succeeded at 7325.
> Hunk #123 succeeded at 7358.
> Hunk #124 succeeded at 7389.
> Hunk #125 succeeded at 7407.
> Hunk #126 succeeded at 7778.
> Hunk #127 succeeded at 7790.
> Hunk #128 succeeded at 7811.
> Hunk #129 succeeded at 7820.
> Hunk #130 succeeded at 7870.
> Hunk #131 succeeded at 7880.
> Hunk #132 succeeded at 7940.
> Hunk #133 succeeded at 7970.
> Hunk #134 succeeded at 7982.
> Hunk #135 succeeded at 8097.
> Hunk #136 succeeded at 8114.
> Hunk #137 succeeded at 8132.
> Hunk #138 succeeded at 8142.
> Hunk #139 succeeded at 8156.
> Hunk #140 succeeded at 8230.
> Hunk #141 succeeded at 8272.
> Hunk #142 succeeded at 8287.
> Hunk #143 succeeded at 8422.
> Hunk #144 succeeded at 8640.
> Hunk #145 succeeded at 8653.
> Hunk #146 succeeded at 8698.
> Hunk #147 succeeded at 8735.
> Hunk #148 succeeded at 8762.
> Hunk #149 succeeded at 8777.
> Hunk #150 succeeded at 8817.
> Hunk #151 succeeded at 8845.
> Hunk #152 succeeded at 8857.
> Hunk #153 succeeded at 8881.
> Hunk #154 succeeded at 8926.
> Hunk #155 succeeded at 9025.
> Hunk #156 succeeded at 9061.
> Hunk #157 succeeded at 9127.
> Hunk #158 succeeded at 9192.
> Hunk #159 succeeded at 9216.
> Hunk #160 succeeded at 9238.
> Hunk #161 succeeded at 9259.
> Hunk #162 succeeded at 9306.
> Hunk #163 succeeded at 9320.
> Hunk #164 succeeded at 9341.
> Hunk #165 succeeded at 9365.
> Hunk #166 succeeded at 9381.
> Hunk #167 succeeded at 9414.
> Hunk #168 succeeded at 9518.
> Hunk #169 succeeded at 9535.
> Hunk #170 succeeded at 9549.
> Hunk #171 succeeded at 9605.
> Hunk #172 succeeded at 9625.
> Hunk #173 succeeded at 9942.
> Hunk #174 succeeded at 9950.
> Hunk #175 succeeded at 9997.
> Hunk #176 succeeded at 10032.
> Hunk #177 succeeded at 10053.
> Hunk #178 succeeded at 10073.
> Hunk #179 succeeded at 10325.
> Hunk #180 succeeded at 10377.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ffs/ffs_extern.h
> |===================================================================
> |--- sys/ufs/ffs/ffs_extern.h   (revision 201766)
> |+++ sys/ufs/ffs/ffs_extern.h   (working copy)
> --------------------------
> Patching file sys/ufs/ffs/ffs_extern.h using Plan A...
> Hunk #1 succeeded at 56.
> Hunk #2 succeeded at 110.
> Hunk #3 succeeded at 119.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ffs/ffs_alloc.c
> |===================================================================
> |--- sys/ufs/ffs/ffs_alloc.c    (revision 201766)
> |+++ sys/ufs/ffs/ffs_alloc.c    (working copy)
> --------------------------
> Patching file sys/ufs/ffs/ffs_alloc.c using Plan A...
> Hunk #1 succeeded at 89.
> Hunk #2 succeeded at 182.
> Hunk #3 succeeded at 380.
> Hunk #4 succeeded at 474.
> Hunk #5 succeeded at 497.
> Hunk #6 succeeded at 505.
> Hunk #7 succeeded at 582.
> Hunk #8 succeeded at 598.
> Hunk #9 succeeded at 624.
> Hunk #10 succeeded at 675.
> Hunk #11 succeeded at 713.
> Hunk #12 succeeded at 797.
> Hunk #13 succeeded at 813.
> Hunk #14 succeeded at 839.
> Hunk #15 succeeded at 890.
> Hunk #16 succeeded at 977.
> Hunk #17 succeeded at 1286.
> Hunk #18 succeeded at 1307.
> Hunk #19 succeeded at 1317.
> Hunk #20 succeeded at 1328.
> Hunk #21 succeeded at 1410.
> Hunk #22 succeeded at 1429.
> Hunk #23 succeeded at 1462.
> Hunk #24 succeeded at 1486.
> Hunk #25 succeeded at 1511.
> Hunk #26 succeeded at 1533.
> Hunk #27 succeeded at 1545.
> Hunk #28 succeeded at 1573.
> Hunk #29 succeeded at 1611.
> Hunk #30 succeeded at 1712.
> Hunk #31 succeeded at 1736.
> Hunk #32 succeeded at 1844.
> Hunk #33 succeeded at 1851.
> Hunk #34 succeeded at 1925.
> Hunk #35 succeeded at 1965.
> Hunk #36 succeeded at 1974.
> Hunk #37 succeeded at 2047.
> Hunk #38 succeeded at 2056.
> Hunk #39 succeeded at 2118.
> Hunk #40 succeeded at 2234.
> Hunk #41 succeeded at 2431.
> Hunk #42 succeeded at 2459.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ffs/softdep.h
> |===================================================================
> |--- sys/ufs/ffs/softdep.h      (revision 201766)
> |+++ sys/ufs/ffs/softdep.h      (working copy)
> --------------------------
> Patching file sys/ufs/ffs/softdep.h using Plan A...
> Hunk #1 succeeded at 98.
> Hunk #2 succeeded at 137.
> Hunk #3 succeeded at 178.
> Hunk #4 succeeded at 213.
> Hunk #5 succeeded at 274.
> Hunk #6 succeeded at 298.
> Hunk #7 succeeded at 309.
> Hunk #8 succeeded at 374.
> Hunk #9 succeeded at 407.
> Hunk #10 succeeded at 431.
> Hunk #11 succeeded at 473.
> Hunk #12 succeeded at 537.
> Hunk #13 succeeded at 570.
> Hunk #14 succeeded at 586.
> Hunk #15 succeeded at 613.
> Hunk #16 succeeded at 631.
> Hunk #17 succeeded at 665.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ffs/ffs_subr.c
> |===================================================================
> |--- sys/ufs/ffs/ffs_subr.c     (revision 201766)
> |+++ sys/ufs/ffs/ffs_subr.c     (working copy)
> --------------------------
> Patching file sys/ufs/ffs/ffs_subr.c using Plan A...
> Hunk #1 succeeded at 37.
> Hunk #2 succeeded at 222.
> Hunk #3 succeeded at 282.
> Hunk #4 succeeded at 314.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ffs/ffs_balloc.c
> |===================================================================
> |--- sys/ufs/ffs/ffs_balloc.c   (revision 201766)
> |+++ sys/ufs/ffs/ffs_balloc.c   (working copy)
> --------------------------
> Patching file sys/ufs/ffs/ffs_balloc.c using Plan A...
> Hunk #1 succeeded at 120.
> Hunk #2 succeeded at 140.
> Hunk #3 succeeded at 192.
> Hunk #4 succeeded at 212.
> Hunk #5 succeeded at 257.
> Hunk #6 succeeded at 307.
> Hunk #7 succeeded at 363.
> Hunk #8 succeeded at 420.
> Hunk #9 succeeded at 477.
> Hunk #10 succeeded at 519.
> Hunk #11 succeeded at 650.
> Hunk #12 succeeded at 703.
> Hunk #13 succeeded at 723.
> Hunk #14 succeeded at 768.
> Hunk #15 succeeded at 818.
> Hunk #16 succeeded at 874.
> Hunk #17 succeeded at 937.
> Hunk #18 succeeded at 994.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ffs/ffs_inode.c
> |===================================================================
> |--- sys/ufs/ffs/ffs_inode.c    (revision 201766)
> |+++ sys/ufs/ffs/ffs_inode.c    (working copy)
> --------------------------
> Patching file sys/ufs/ffs/ffs_inode.c using Plan A...
> Hunk #1 succeeded at 232.
> Hunk #2 succeeded at 336.
> Hunk #3 succeeded at 447.
> Hunk #4 succeeded at 466.
> Hunk #5 succeeded at 499.
> Hunk #6 succeeded at 641.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ffs/fs.h
> |===================================================================
> |--- sys/ufs/ffs/fs.h   (revision 201766)
> |+++ sys/ufs/ffs/fs.h   (working copy)
> --------------------------
> Patching file sys/ufs/ffs/fs.h using Plan A...
> Hunk #1 succeeded at 337.
> Hunk #2 succeeded at 414.
> Hunk #3 succeeded at 604.
> Hunk #4 succeeded at 640.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/ufs/ffs/ffs_snapshot.c
> |===================================================================
> |--- sys/ufs/ffs/ffs_snapshot.c (revision 201766)
> |+++ sys/ufs/ffs/ffs_snapshot.c (working copy)
> --------------------------
> Patching file sys/ufs/ffs/ffs_snapshot.c using Plan A...
> Hunk #1 succeeded at 582.
> Hunk #2 succeeded at 599.
> Hunk #3 succeeded at 701.
> Hunk #4 succeeded at 1221.
> Hunk #5 succeeded at 1501.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/kern/vfs_bio.c
> |===================================================================
> |--- sys/kern/vfs_bio.c (revision 201766)
> |+++ sys/kern/vfs_bio.c (working copy)
> --------------------------
> Patching file sys/kern/vfs_bio.c using Plan A...
> Hunk #1 succeeded at 216.
> Hunk #2 succeeded at 475.
> Hunk #3 succeeded at 2136.
> Hunk #4 succeeded at 2154.
> Hunk #5 succeeded at 2170.
> Hmm...  The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: sys/sys/buf.h
> |===================================================================
> |--- sys/sys/buf.h      (revision 201766)
> |+++ sys/sys/buf.h      (working copy)
> --------------------------
> Patching file sys/sys/buf.h using Plan A...
> Hunk #1 succeeded at 493.
> done
> evo#
> evo# make buildworld
> --------------------------------------------------------------
>>>> World build started on Sun Jan 10 16:22:14 EET 2010
> --------------------------------------------------------------
>
> ==
> _______________________________________________
> freebsd-current_at_freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe_at_freebsd.org"
>
Received on Sun Jan 10 2010 - 22:10:27 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:00 UTC