Date: Mon, 23 Aug 1999 11:15:49 -0400 (EDT) From: Spencer Portee <sporty@sporty.org> To: Sheldon Hearn <sheldonh@uunet.co.za> Cc: spencer portee <spam@sporty.org>, freebsd-gnats-submit@freebsd.org, freebsd-bugs@freebsd.org, dyson@iquest.net Subject: Re: kern/13314: can't compile when softupdates + debug. Message-ID: <Pine.BSF.4.05.9908231115340.13235-100000@bsd1.nyct.net> In-Reply-To: <55822.935420857@axl.noc.iafrica.com>
next in thread | previous in thread | raw e-mail | index | archive | help
or some odd combination of the two. thanx for the prompt reply.
On Mon, 23 Aug 1999, Sheldon Hearn wrote:
>
> It looks like the problem was introduced in rev 1.28 of ffs_alloc.c .
> I think the patch below is the correct fix to this problem. Please try
> it with
>
> options DIAGNOSTIC
>
> instead of
>
> options DEBUG
>
> in your kernel config file.
>
> Your feedback would be greatly appreciated.
>
> Thanks,
> Sheldon.
>
> Index: ffs_alloc.c
> ===================================================================
> RCS file: /home/ncvs/src/sys/ufs/ffs/ffs_alloc.c,v
> retrieving revision 1.58
> diff -u -d -r1.58 ffs_alloc.c
> --- ffs_alloc.c 1999/05/12 22:32:07 1.58
> +++ ffs_alloc.c 1999/08/23 14:58:03
> @@ -343,7 +343,7 @@
> static int doreallocblks = 1;
> SYSCTL_INT(_vfs_ffs, FFS_REALLOCBLKS, doreallocblks, CTLFLAG_RW, &doreallocblks, 0, "");
>
> -#ifdef DEBUG
> +#ifdef DIAGNOSTIC
> static volatile int prtrealloc = 0;
> #endif
>
> @@ -447,7 +447,7 @@
> * block pointers in the inode and indirect blocks associated
> * with the file.
> */
> -#ifdef DEBUG
> +#ifdef DIAGNOSTIC
> if (prtrealloc)
> printf("realloc: ino %d, lbns %d-%d\n\told:", ip->i_number,
> start_lbn, end_lbn);
> @@ -465,7 +465,7 @@
> if (dbtofsb(fs, buflist->bs_children[i]->b_blkno) != *bap)
> panic("ffs_reallocblks: alloc mismatch");
> #endif
> -#ifdef DEBUG
> +#ifdef DIAGNOSTIC
> if (prtrealloc)
> printf(" %d,", *bap);
> #endif
> @@ -514,7 +514,7 @@
> /*
> * Last, free the old blocks and assign the new blocks to the buffers.
> */
> -#ifdef DEBUG
> +#ifdef DIAGNOSTIC
> if (prtrealloc)
> printf("\n\tnew:");
> #endif
> @@ -524,7 +524,7 @@
> dbtofsb(fs, buflist->bs_children[i]->b_blkno),
> fs->fs_bsize);
> buflist->bs_children[i]->b_blkno = fsbtodb(fs, blkno);
> -#ifdef DEBUG
> +#ifdef DIAGNOSTIC
> if (!ffs_checkblk(ip,
> dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize))
> panic("ffs_reallocblks: unallocated block 3");
> @@ -532,7 +532,7 @@
> printf(" %d,", blkno);
> #endif
> }
> -#ifdef DEBUG
> +#ifdef DIAGNOSTIC
> if (prtrealloc) {
> prtrealloc--;
> printf("\n");
>
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.05.9908231115340.13235-100000>