From owner-p4-projects@FreeBSD.ORG Sat May 31 17:40:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 066351065677; Sat, 31 May 2008 17:40:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A43E01065675 for ; Sat, 31 May 2008 17:40:11 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D86A8FC20 for ; Sat, 31 May 2008 17:40:11 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4VHeBXh052459 for ; Sat, 31 May 2008 17:40:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4VHeBSI052455 for perforce@freebsd.org; Sat, 31 May 2008 17:40:11 GMT (envelope-from jhb@freebsd.org) Date: Sat, 31 May 2008 17:40:11 GMT Message-Id: <200805311740.m4VHeBSI052455@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 142639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 May 2008 17:40:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=142639 Change 142639 by jhb@jhb_mutex on 2008/05/31 17:39:16 Move some patches off of my laptop's /sys: - Put []'s around kernel processes' command name like ps(1) - #if 0 some dubious callout munging in kbdmux(4) - Don't explicitly drop Giant in the udf filesystem. Usually this isn't really needed (at this point udf should be made MPSAFE instead) and it breaks the module ABI since udf.ko depends on WITNESS. Affected files ... .. //depot/projects/smpng/sys/ddb/db_ps.c#41 edit .. //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#8 edit .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#38 edit Differences ... ==== //depot/projects/smpng/sys/ddb/db_ps.c#41 (text+ko) ==== @@ -189,13 +189,19 @@ if (cred != NULL && jailed(cred)) strlcat(state, "J", sizeof(state)); db_printf(" %-6.6s ", state); - if (p->p_flag & P_HADTHREADS) + if (p->p_flag & P_HADTHREADS) { #ifdef __LP64__ - db_printf(" (threaded) %s\n", - p->p_comm); + db_printf(" (threaded) "); #else - db_printf(" (threaded) %s\n", p->p_comm); + db_printf(" (threaded) "); #endif + if (p->p_flag & P_SYSTEM) + db_printf("["); + db_printf("%s", p->p_comm); + if (p->p_flag & P_SYSTEM) + db_printf("]"); + db_printf("\n"); + } FOREACH_THREAD_IN_PROC(p, td) { dumpthread(p, td, p->p_flag & P_HADTHREADS); if (db_pager_quit) ==== //depot/projects/smpng/sys/dev/kbdmux/kbdmux.c#8 (text+ko) ==== @@ -196,6 +196,7 @@ KBDMUX_LOCK_ASSERT(state, MA_OWNED); +#if 0 if (callout_pending(&state->ks_timo)) return; /* callout was reset */ @@ -203,6 +204,7 @@ return; /* callout was stopped */ callout_deactivate(&state->ks_timo); +#endif /* queue interrupt task if needed */ if (state->ks_inq.c_cc > 0 && !(state->ks_flags & TASK) && ==== //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#38 (text+ko) ==== @@ -319,11 +319,9 @@ struct g_consumer *cp; struct bufobj *bo; - DROP_GIANT(); g_topology_lock(); error = g_vfs_open(devvp, &cp, "udf", 0); g_topology_unlock(); - PICKUP_GIANT(); VOP_UNLOCK(devvp, 0); if (error) return error; @@ -363,11 +361,9 @@ if (((logical_secsize % cp->provider->sectorsize) != 0) || (logical_secsize < cp->provider->sectorsize)) { - DROP_GIANT(); g_topology_lock(); g_vfs_close(cp, td); g_topology_unlock(); - PICKUP_GIANT(); return (EINVAL); } @@ -491,11 +487,9 @@ FREE(udfmp, M_UDFMOUNT); if (bp != NULL) brelse(bp); - DROP_GIANT(); g_topology_lock(); g_vfs_close(cp, td); g_topology_unlock(); - PICKUP_GIANT(); return error; }; @@ -522,11 +516,9 @@ #endif } - DROP_GIANT(); g_topology_lock(); g_vfs_close(udfmp->im_cp, td); g_topology_unlock(); - PICKUP_GIANT(); vrele(udfmp->im_devvp); if (udfmp->s_table != NULL)