From owner-trustedbsd-cvs@FreeBSD.ORG Thu Sep 7 13:51:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E8B616A508 for ; Thu, 7 Sep 2006 13:51:52 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2647A43D8A for ; Thu, 7 Sep 2006 13:51:38 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id A524046D91 for ; Thu, 7 Sep 2006 09:51:37 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 620EA5AA89; Thu, 7 Sep 2006 13:32:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ED9C16A505; Thu, 7 Sep 2006 13:31:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 44CE516A4EF for ; Thu, 7 Sep 2006 13:31:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 572BD43E49 for ; Thu, 7 Sep 2006 13:31:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k87DV9tB011336 for ; Thu, 7 Sep 2006 13:31:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87DV92G011333 for perforce@freebsd.org; Thu, 7 Sep 2006 13:31:09 GMT (envelope-from millert@freebsd.org) Date: Thu, 7 Sep 2006 13:31:09 GMT Message-Id: <200609071331.k87DV92G011333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 105782 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Sep 2006 13:51:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=105782 Change 105782 by millert@millert_g5tower on 2006/09/07 13:30:14 Add a keepold argument to labelh_modify() that tells it not to free the old label handle. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#8 (text+ko) ==== @@ -150,7 +150,7 @@ * Returned label handle is locked. */ ipc_labelh_t -labelh_modify(ipc_labelh_t old) +labelh_modify(ipc_labelh_t old, int keepold) { ipc_labelh_t lh; @@ -163,7 +163,8 @@ return (old); lh = labelh_duplicate(old); lh_release(old); - lh_check_unlock(old); + if (!keepold) + lh_check_unlock(old); lh_lock(lh); return (lh); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#5 (text+ko) ==== @@ -45,7 +45,7 @@ void labelh_destroy(ipc_port_t port); ipc_labelh_t labelh_duplicate(ipc_labelh_t old); -ipc_labelh_t labelh_modify(ipc_labelh_t old); +ipc_labelh_t labelh_modify(ipc_labelh_t old, int keepold); ipc_labelh_t labelh_new(int canblock); kern_return_t labelh_new_user(ipc_space_t, struct label *, mach_port_name_t *); void labelh_release(ipc_labelh_t lh);