Module Name: src Committed By: jdolecek Date: Sat Apr 11 17:43:54 UTC 2020
Modified Files: src/sys/ufs: files.ufs src/sys/ufs/ffs: ffs_wapbl.c src/sys/ufs/ufs: ufs_wapbl.h Removed Files: src/sys/ufs/ufs: ufs_wapbl.c Log Message: remove noncompilable WAPBL_DEBUG_INODES PR kern/49554 by Thomas Klausner To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/ufs/files.ufs cvs rdiff -u -r1.45 -r1.46 src/sys/ufs/ffs/ffs_wapbl.c cvs rdiff -u -r1.25 -r0 src/sys/ufs/ufs/ufs_wapbl.c cvs rdiff -u -r1.18 -r1.19 src/sys/ufs/ufs/ufs_wapbl.h 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/files.ufs diff -u src/sys/ufs/files.ufs:1.45 src/sys/ufs/files.ufs:1.46 --- src/sys/ufs/files.ufs:1.45 Mon Jun 17 03:32:58 2019 +++ src/sys/ufs/files.ufs Sat Apr 11 17:43:54 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.ufs,v 1.45 2019/06/17 03:32:58 christos Exp $ +# $NetBSD: files.ufs,v 1.46 2020/04/11 17:43:54 jdolecek Exp $ deffs FFS deffs EXT2FS @@ -111,4 +111,3 @@ file ufs/ufs/quota2_subr.c quota2 & (ff file ufs/ufs/ufs_rename.c ffs | mfs | chfs file ufs/ufs/ufs_vfsops.c ufs & (ffs | mfs | ext2fs | chfs) file ufs/ufs/ufs_vnops.c ufs & (ffs | mfs | ext2fs | chfs) -file ufs/ufs/ufs_wapbl.c ffs & wapbl Index: src/sys/ufs/ffs/ffs_wapbl.c diff -u src/sys/ufs/ffs/ffs_wapbl.c:1.45 src/sys/ufs/ffs/ffs_wapbl.c:1.46 --- src/sys/ufs/ffs/ffs_wapbl.c:1.45 Fri Jan 17 20:08:10 2020 +++ src/sys/ufs/ffs/ffs_wapbl.c Sat Apr 11 17:43:54 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_wapbl.c,v 1.45 2020/01/17 20:08:10 ad Exp $ */ +/* $NetBSD: ffs_wapbl.c,v 1.46 2020/04/11 17:43:54 jdolecek Exp $ */ /*- * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.45 2020/01/17 20:08:10 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.46 2020/04/11 17:43:54 jdolecek Exp $"); #define WAPBL_INTERNAL @@ -179,10 +179,6 @@ ffs_wapbl_sync_metadata(struct mount *mp UFS_WAPBL_JLOCK_ASSERT(ump->um_mountp); -#ifdef WAPBL_DEBUG_INODES - ufs_wapbl_verify_inodes(mp, __func__); -#endif - for (wd = fdealloc; wd != NULL; wd = TAILQ_NEXT(wd, wd_entries)) { /* * blkfree errors are unreported, might silently fail Index: src/sys/ufs/ufs/ufs_wapbl.h diff -u src/sys/ufs/ufs/ufs_wapbl.h:1.18 src/sys/ufs/ufs/ufs_wapbl.h:1.19 --- src/sys/ufs/ufs/ufs_wapbl.h:1.18 Thu Mar 5 15:18:55 2020 +++ src/sys/ufs/ufs/ufs_wapbl.h Sat Apr 11 17:43:54 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_wapbl.h,v 1.18 2020/03/05 15:18:55 riastradh Exp $ */ +/* $NetBSD: ufs_wapbl.h,v 1.19 2020/04/11 17:43:54 jdolecek Exp $ */ /*- * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc. @@ -82,18 +82,6 @@ #if defined(WAPBL) -#if defined(WAPBL_DEBUG) -#define WAPBL_DEBUG_INODES -#endif - -#ifdef WAPBL_DEBUG_INODES -#error Undefine WAPBL_DEBUG_INODES or update the code. Have a nice day. -#endif - -#ifdef WAPBL_DEBUG_INODES -void ufs_wapbl_verify_inodes(struct mount *, const char *); -#endif - static __inline int ufs_wapbl_begin(struct mount *mp, const char *file, int line) { @@ -102,10 +90,6 @@ ufs_wapbl_begin(struct mount *mp, const error = wapbl_begin(mp->mnt_wapbl, file, line); if (error) return error; -#ifdef WAPBL_DEBUG_INODES - if (mp->mnt_wapbl->wl_lock.lk_exclusivecount == 1) - ufs_wapbl_verify_inodes(mp, "wapbl_begin"); -#endif } return 0; } @@ -114,10 +98,6 @@ static __inline void ufs_wapbl_end(struct mount *mp) { if (mp->mnt_wapbl) { -#ifdef WAPBL_DEBUG_INODES - if (mp->mnt_wapbl->wl_lock.lk_exclusivecount == 1) - ufs_wapbl_verify_inodes(mp, "wapbl_end"); -#endif wapbl_end(mp->mnt_wapbl); } }