From owner-p4-projects@FreeBSD.ORG  Thu Mar 30 20:55:42 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6DDD016A423; Thu, 30 Mar 2006 20:55:42 +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 322F816A420
	for <perforce@freebsd.org>; Thu, 30 Mar 2006 20:55:42 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F3A0643D46
	for <perforce@freebsd.org>; Thu, 30 Mar 2006 20:55:41 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2UKtf60084555
	for <perforce@freebsd.org>; Thu, 30 Mar 2006 20:55:41 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2UKtfbx084552
	for perforce@freebsd.org; Thu, 30 Mar 2006 20:55:41 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 30 Mar 2006 20:55:41 GMT
Message-Id: <200603302055.k2UKtfbx084552@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94325 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Mar 2006 20:55:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=94325

Change 94325 by jhb@jhb_slimer on 2006/03/30 20:55:32

	Various diff-reduction and cleanups.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_linker.c#53 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_linker.c#53 (text+ko) ====

@@ -473,7 +473,6 @@
 	const char *filename;
 
 	KLD_LOCK_ASSERT();
-	lf = NULL;
 	filename = linker_basename(pathname);
 
 	KLD_DPF(FILE, ("linker_make_file: new file, filename=%s\n", filename));
@@ -484,11 +483,11 @@
 	lf->userrefs = 0;
 	lf->flags = 0;
 	lf->filename = linker_strdup(filename);
+	LINKER_GET_NEXT_FILE_ID(lf->id);
 	lf->ndeps = 0;
 	lf->deps = NULL;
 	STAILQ_INIT(&lf->common);
 	TAILQ_INIT(&lf->modules);
-	LINKER_GET_NEXT_FILE_ID(lf->id);
 	TAILQ_INSERT_TAIL(&linker_files, lf, link);
 	return (lf);
 }
@@ -522,7 +521,7 @@
 	error = mac_check_kld_unload(curthread->td_ucred);
 	if (error)
 		return (error);
-#endif	
+#endif
 
 	KLD_LOCK_ASSERT();
 	KLD_DPF(FILE, ("linker_file_unload: lf->refs=%d\n", file->refs));
@@ -843,17 +842,19 @@
 		modname = pathname;
 	}
 
+	KLD_LOCK();
+	error = linker_load_module_internal(kldname, modname, NULL, NULL, &lf);
+	if (error) {
+		KLD_UNLOCK();
+		goto out;
+	}
 #ifdef HWPMC_HOOKS
 	pkm.pm_file = lf->filename;
 	pkm.pm_address = (uintptr_t) lf->address;
 	PMC_CALL_HOOK(td, PMC_FN_KLD_LOAD, (void *) &pkm);
 #endif
-	KLD_LOCK();
-	error = linker_load_module_internal(kldname, modname, NULL, NULL, &lf);
-	if (error == 0) {
-		lf->userrefs++;
-		td->td_retval[0] = lf->id;
-	}
+	lf->userrefs++;
+	td->td_retval[0] = lf->id;
 	KLD_UNLOCK();
 out:
 	free(pathname, M_TEMP);