svn commit: r325386 - head/sys/kern

Conrad Meyer cem at freebsd.org
Sun Nov 5 18:32:05 UTC 2017


E.g.,

--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -304,8 +304,7 @@ retry:
        }

        if (bp->b_blkno == bp->b_lblkno) {
-               if (lbprev >= UFS_NDADDR)
-                       panic("ffs_realloccg: lbprev out of range");
+               ASSERT(lbprev < UFS_NDADDR, "ffs_realloccg: lbprev out
of range");
                bp->b_blkno = fsbtodb(fs, bprev);
        }

On Sun, Nov 5, 2017 at 9:30 AM, Konstantin Belousov <kostikbel at gmail.com> wrote:
> On Sun, Nov 05, 2017 at 09:16:28AM -0800, Conrad Meyer wrote:
>> On Sun, Nov 5, 2017 at 5:06 AM, Konstantin Belousov <kostikbel at gmail.com> wrote:
>> > On Sat, Nov 04, 2017 at 12:04:56PM -0700, Conrad Meyer wrote:
>> >> This is a functional change, because MPASS (via KASSERT) is only
>> >> enabled on DEBUG kernels.  Ideally we would have a kind of ASSERT that
>> >> worked on NODEBUG kernels.
>> > Why would we need such thing ?
>> >
>> > Our conventions are clear: consistency checks are normally done with
>> > KASSERT() and enabled for DEBUG (INVARIANTS or harder) configurations.
>> > We only leave explicit panics in the production kernels when there
>> > continuation of operations is worse then abort, e.g. when UFS detects
>> > the metadata corruption.
>>
>> An always-on assert construct would be precisely for the latter
>> scenario.  Instead, we litter the tree with "if (!invariant) {
>> panic(); }."
> We do
>
> #ifdef INVARIANTS
> if (!condition) panic();
> #endif
>
> I do not understand what do you mean by 'instead'.


More information about the svn-src-all mailing list