Module Name:    src
Committed By:   pgoyette
Date:           Tue May  5 09:22:33 UTC 2015

Modified Files:
        src/sys/dev/sysmon: sysmon.c

Log Message:
Optimize a bit - don't re-enter the mutex if we're just going to exit.

While here, remove some parens around a return value.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/sysmon/sysmon.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/dev/sysmon/sysmon.c
diff -u src/sys/dev/sysmon/sysmon.c:1.27 src/sys/dev/sysmon/sysmon.c:1.28
--- src/sys/dev/sysmon/sysmon.c:1.27	Tue May  5 00:28:25 2015
+++ src/sys/dev/sysmon/sysmon.c	Tue May  5 09:22:33 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysmon.c,v 1.27 2015/05/05 00:28:25 pgoyette Exp $	*/
+/*	$NetBSD: sysmon.c,v 1.28 2015/05/05 09:22:33 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.27 2015/05/05 00:28:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.28 2015/05/05 09:22:33 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -152,9 +152,9 @@ sysmonopen(dev_t dev, int flag, int mode
 			mutex_exit(&sysmon_minor_mtx);
 			error = module_autoload(sysmon_mod[minor(dev)],
 						MODULE_CLASS_MISC);
-			mutex_enter(&sysmon_minor_mtx);
 			if (error)
-				break;
+				return error;
+			mutex_enter(&sysmon_minor_mtx);
 			if (sysmon_opvec_table[minor(dev)] == NULL) {
 				error = ENODEV;
 				break;
@@ -170,7 +170,7 @@ sysmonopen(dev_t dev, int flag, int mode
 	}
 
 	mutex_exit(&sysmon_minor_mtx);
-	return (error);
+	return error;
 }
 
 /*

Reply via email to