Module Name: src
Committed By: riastradh
Date: Sat Mar 18 05:29:16 UTC 2017
Modified Files:
src/sys/ufs/ffs: ffs_snapshot.c
Log Message:
#if DIAGNOSTIC panic ---> KASSERT
To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/ufs/ffs/ffs_snapshot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.146 src/sys/ufs/ffs/ffs_snapshot.c:1.147
--- src/sys/ufs/ffs/ffs_snapshot.c:1.146 Wed Mar 1 10:42:45 2017
+++ src/sys/ufs/ffs/ffs_snapshot.c Sat Mar 18 05:29:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.146 2017/03/01 10:42:45 hannken Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.147 2017/03/18 05:29:16 riastradh Exp $ */
/*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.146 2017/03/01 10:42:45 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.147 2017/03/18 05:29:16 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -1993,10 +1993,9 @@ retry:
if (gen != si->si_gen)
goto retry;
}
-#ifdef DIAGNOSTIC
- if (blkno == BLK_SNAP && bp->b_lblkno >= 0)
- panic("ffs_copyonwrite: bad copy block");
-#endif
+ KASSERTMSG((blkno != BLK_SNAP || bp->b_lblkno < 0),
+ "ffs_copyonwrite: bad copy block: blkno %jd, lblkno %jd",
+ (intmax_t)blkno, (intmax_t)bp->b_lblkno);
if (blkno != 0)
continue;
