Module Name: src
Committed By: pgoyette
Date: Fri Jul 22 23:02:55 UTC 2016
Modified Files:
src/sys/kern [pgoyette-localcount]: subr_devsw.c
Log Message:
Only retrieve the bdev/cdev from the xdevsw[] array once.
To generate a diff of this commit:
cvs rdiff -u -r1.34.2.10 -r1.34.2.11 src/sys/kern/subr_devsw.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/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.34.2.10 src/sys/kern/subr_devsw.c:1.34.2.11
--- src/sys/kern/subr_devsw.c:1.34.2.10 Fri Jul 22 11:59:51 2016
+++ src/sys/kern/subr_devsw.c Fri Jul 22 23:02:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.34.2.10 2016/07/22 11:59:51 pgoyette Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.34.2.11 2016/07/22 23:02:55 pgoyette Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34.2.10 2016/07/22 11:59:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34.2.11 2016/07/22 23:02:55 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_dtrace.h"
@@ -478,7 +478,7 @@ bdevsw_lookup_acquire(dev_t dev)
membar_datadep_consumer();
/* If the devsw is not statically linked, acquire a reference */
- if (bdevsw[bmajor]->d_localcount != NULL)
+ if (bdev->d_localcount != NULL)
localcount_acquire(bdevsw[bmajor]->d_localcount);
out: pserialize_read_exit(s);
@@ -539,7 +539,7 @@ cdevsw_lookup_acquire(dev_t dev)
membar_datadep_consumer();
/* If the devsw is not statically linked, acquire a reference */
- if (cdevsw[cmajor]->d_localcount != NULL)
+ if (cdev->d_localcount != NULL)
localcount_acquire(cdevsw[cmajor]->d_localcount);
out: pserialize_read_exit(s);
