Module Name: src Committed By: manu Date: Wed Oct 19 01:39:29 UTC 2011
Modified Files: src/sys/fs/puffs: puffs_msgif.c puffs_node.c puffs_vfsops.c puffs_vnops.c Log Message: Remove #ifdef DIAGNOSTIC guards around KASSERT, as the macro contains them To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/fs/puffs/puffs_msgif.c cvs rdiff -u -r1.21 -r1.22 src/sys/fs/puffs/puffs_node.c cvs rdiff -u -r1.99 -r1.100 src/sys/fs/puffs/puffs_vfsops.c cvs rdiff -u -r1.159 -r1.160 src/sys/fs/puffs/puffs_vnops.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/fs/puffs/puffs_msgif.c diff -u src/sys/fs/puffs/puffs_msgif.c:1.88 src/sys/fs/puffs/puffs_msgif.c:1.89 --- src/sys/fs/puffs/puffs_msgif.c:1.88 Tue Oct 18 15:39:09 2011 +++ src/sys/fs/puffs/puffs_msgif.c Wed Oct 19 01:39:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: puffs_msgif.c,v 1.88 2011/10/18 15:39:09 manu Exp $ */ +/* $NetBSD: puffs_msgif.c,v 1.89 2011/10/19 01:39:29 manu Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.88 2011/10/18 15:39:09 manu Exp $"); +__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.89 2011/10/19 01:39:29 manu Exp $"); #include <sys/param.h> #include <sys/atomic.h> @@ -134,10 +134,8 @@ puffs_msgpark_alloc(int waitok) { struct puffs_msgpark *park; -#ifdef DIAGNOSTIC - if (curlwp == uvm.pagedaemon_lwp) - KASSERT(!waitok); -#endif + KASSERT(curlwp != uvm.pagedaemon_lwp || !waitok); + park = pool_cache_get(parkpc, waitok ? PR_WAITOK : PR_NOWAIT); if (park == NULL) return park; @@ -238,10 +236,7 @@ puffs_msgmem_alloc(size_t len, struct pu struct puffs_msgpark *park; void *m; -#ifdef DIAGNOSTIC - if (curlwp == uvm.pagedaemon_lwp) - KASSERT(!cansleep); -#endif + KASSERT(curlwp != uvm.pagedaemon_lwp || !cansleep); m = kmem_zalloc(len, cansleep ? KM_SLEEP : KM_NOSLEEP); if (m == NULL) { KASSERT(cansleep == 0); @@ -960,9 +955,7 @@ puffs_msgif_dispatch(void *this, struct } pf = (struct puffs_flush *)preq; -#ifdef DIAGNOSTIC KASSERT(curlwp != uvm.pagedaemon_lwp); -#endif psopr = kmem_alloc(sizeof(*psopr), KM_SLEEP); memcpy(&psopr->psopr_pf, pf, sizeof(*pf)); psopr->psopr_sopreq = PUFFS_SOPREQ_FLUSH; @@ -986,9 +979,7 @@ puffs_msgif_dispatch(void *this, struct DPRINTF(("dispatch: unmount 0x%x\n", preq->preq_optype)); -#ifdef DIAGNOSTIC KASSERT(curlwp != uvm.pagedaemon_lwp); -#endif psopr = kmem_alloc(sizeof(*psopr), KM_SLEEP); psopr->psopr_preq = *preq; psopr->psopr_sopreq = PUFFS_SOPREQ_UNMOUNT; Index: src/sys/fs/puffs/puffs_node.c diff -u src/sys/fs/puffs/puffs_node.c:1.21 src/sys/fs/puffs/puffs_node.c:1.22 --- src/sys/fs/puffs/puffs_node.c:1.21 Tue Oct 18 15:39:09 2011 +++ src/sys/fs/puffs/puffs_node.c Wed Oct 19 01:39:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: puffs_node.c,v 1.21 2011/10/18 15:39:09 manu Exp $ */ +/* $NetBSD: puffs_node.c,v 1.22 2011/10/19 01:39:29 manu Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.21 2011/10/18 15:39:09 manu Exp $"); +__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.22 2011/10/19 01:39:29 manu Exp $"); #include <sys/param.h> #include <sys/hash.h> @@ -231,9 +231,7 @@ puffs_newnode(struct mount *mp, struct v } } -#ifdef DIAGNOSTIC KASSERT(curlwp != uvm.pagedaemon_lwp); -#endif pnc = kmem_alloc(sizeof(struct puffs_newcookie), KM_SLEEP); pnc->pnc_cookie = ck; LIST_INSERT_HEAD(&pmp->pmp_newcookie, pnc, pnc_entries); Index: src/sys/fs/puffs/puffs_vfsops.c diff -u src/sys/fs/puffs/puffs_vfsops.c:1.99 src/sys/fs/puffs/puffs_vfsops.c:1.100 --- src/sys/fs/puffs/puffs_vfsops.c:1.99 Tue Oct 18 15:39:09 2011 +++ src/sys/fs/puffs/puffs_vfsops.c Wed Oct 19 01:39:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: puffs_vfsops.c,v 1.99 2011/10/18 15:39:09 manu Exp $ */ +/* $NetBSD: puffs_vfsops.c,v 1.100 2011/10/19 01:39:29 manu Exp $ */ /* * Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.99 2011/10/18 15:39:09 manu Exp $"); +__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.100 2011/10/19 01:39:29 manu Exp $"); #include <sys/param.h> #include <sys/mount.h> @@ -235,9 +235,7 @@ puffs_vfsop_mount(struct mount *mp, cons copy_statvfs_info(&args->pa_svfsb, mp); (void)memcpy(&mp->mnt_stat, &args->pa_svfsb, sizeof(mp->mnt_stat)); -#ifdef DIAGNOSTIC KASSERT(curlwp != uvm.pagedaemon_lwp); -#endif pmp = kmem_zalloc(sizeof(struct puffs_mount), KM_SLEEP); mp->mnt_fs_bshift = DEV_BSHIFT; @@ -419,9 +417,7 @@ puffs_vfsop_unmount(struct mount *mp, in * Release kernel thread now that there is nothing * it would be wanting to lock. */ -#ifdef DIAGNOSTIC KASSERT(curlwp != uvm.pagedaemon_lwp); -#endif psopr = kmem_alloc(sizeof(*psopr), KM_SLEEP); psopr->psopr_sopreq = PUFFS_SOPREQSYS_EXIT; mutex_enter(&pmp->pmp_sopmtx); Index: src/sys/fs/puffs/puffs_vnops.c diff -u src/sys/fs/puffs/puffs_vnops.c:1.159 src/sys/fs/puffs/puffs_vnops.c:1.160 --- src/sys/fs/puffs/puffs_vnops.c:1.159 Tue Oct 18 15:39:09 2011 +++ src/sys/fs/puffs/puffs_vnops.c Wed Oct 19 01:39:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: puffs_vnops.c,v 1.159 2011/10/18 15:39:09 manu Exp $ */ +/* $NetBSD: puffs_vnops.c,v 1.160 2011/10/19 01:39:29 manu Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.159 2011/10/18 15:39:09 manu Exp $"); +__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.160 2011/10/19 01:39:29 manu Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -1243,9 +1243,7 @@ puffs_vnop_readdir(void *v) /* provide cookies to caller if so desired */ if (ap->a_cookies) { -#ifdef DIAGNOSTIC KASSERT(curlwp != uvm.pagedaemon_lwp); -#endif *ap->a_cookies = malloc(readdir_msg->pvnr_ncookies*CSIZE, M_TEMP, M_WAITOK); *ap->a_ncookies = readdir_msg->pvnr_ncookies; @@ -2268,10 +2266,7 @@ puffs_vnop_strategy(void *v) cansleep = (curlwp == uvm.pagedaemon_lwp || dofaf) ? 0 : 1; -#ifdef DIAGNOSTIC - if (curlwp == uvm.pagedaemon_lwp) - KASSERT(dofaf || BIOASYNC(bp)); -#endif + KASSERT(curlwp != uvm.pagedaemon_lwp || dofaf || BIOASYNC(bp)); /* allocate transport structure */ tomove = PUFFS_TOMOVE(bp->b_bcount, pmp); @@ -2537,10 +2532,7 @@ puffs_vnop_getpages(void *v) #ifdef notnowjohn /* allocate worst-case memory */ runsizes = ((npages / 2) + 1) * sizeof(struct puffs_cacherun); -#ifdef DIAGNOSTIC - if (curlwp == uvm.pagedaemon_lwp) - KASSERT(locked); -#endif + KASSERT(curlwp != uvm.pagedaemon_lwp || locked); pcinfo = kmem_zalloc(sizeof(struct puffs_cacheinfo) + runsize, locked ? KM_NOSLEEP : KM_SLEEP);