Otto , i couldn't apply the patch , i get some errors:

patch -p0 < patch1.txt
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: setup.c
|===================================================================
|RCS file: /cvs/src/sbin/fsck_ffs/setup.c,v
|retrieving revision 1.29
|diff -u -p -r1.29 setup.c
|--- setup.c 16 Feb 2007 08:34:29 -0000 1.29
|+++ setup.c 19 Jul 2007 18:02:36 -0000
--------------------------
Patching file setup.c using Plan A...
Hunk #1 failed at 336.
Hunk #2 failed at 347.
2 out of 2 hunks failed--saving rejects to setup.c.rej
Hmm...  Ignoring the trailing garbage.
done

---

But i added the 2 lines (if and endif) manually in setup.c, so the code
looks like this:

                sbdirty();
                dirty(&asblk);
        }
        #if 0
        if (sblock.fs_cgsize != fragroundup(&sblock, CGSIZE(&sblock))) {
                pwarn("INCONSISTENT CGSIZE=%d\n", sblock.fs_cgsize);
                sblock.fs_cgsize = fragroundup(&sblock, CGSIZE(&sblock));
                if (preen)
                        printf(" (FIXED)\n");
                if (preen || reply("FIX") == 1) {
                        sbdirty();
                        dirty(&asblk);
                }
        }
        #endif
        if (INOPB(&sblock) != sblock.fs_bsize / sizeof(struct ufs1_dinode))
{
                pwarn("INCONSISTENT INOPB=%d\n", INOPB(&sblock));
                sblock.fs_inopb = sblock.fs_bsize / sizeof(struct
ufs1_dinode);

--

Will this work?


Regards,
Marcos

----- Original Message ----- 
From: "Otto Moerbeek" <[EMAIL PROTECTED]>
To: "Marcos Laufer" <[EMAIL PROTECTED]>
Cc: <misc@openbsd.org>
Sent: Friday, July 20, 2007 4:02 PM
Subject: Re: fsck Segmentation fault on 4.1


On Fri, 20 Jul 2007, Marcos Laufer wrote:

> Will this be moved to -stable, or is it an uncommon thing ?

It's not very common, but the impact is pretty high. So once some more
test reports are coming in, we'll consider it.

-Otto

>
> ----- Original Message ----- 
> From: "Otto Moerbeek" <[EMAIL PROTECTED]>
> To: "Marcos Laufer" <[EMAIL PROTECTED]>
> Cc: <misc@openbsd.org>
> Sent: Thursday, July 19, 2007 3:09 PM
> Subject: Re: fsck Segmentation fault on 4.1
>
>
> On Fri, 13 Jul 2007, Otto Moerbeek wrote:
>
> > On Fri, 13 Jul 2007, Marcos Laufer wrote:
> >
> > > Otto ,
> > >
> > > This is the error i get:

Reply via email to