From 6dfb0593272d9b56a72bc5c5f286ebcc5fafd427 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Tue, 1 Feb 2022 02:00:29 +0000 Subject: [PATCH 01/13] fixup! driver(9): Fix synchronization of devsw_attach/lookup/detach. --- sys/kern/subr_devsw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_devsw.c b/sys/kern/subr_devsw.c index 9da96cf29e0f..3e8ed1b17dbf 100644 --- a/sys/kern/subr_devsw.c +++ b/sys/kern/subr_devsw.c @@ -286,8 +286,8 @@ bdevsw_attach(const struct bdevsw *devsw, devmajor_t *devmajor) KASSERT(bdevsw == bdevsw0); newbdevsw = kmem_zalloc(MAXDEVSW * sizeof(newbdevsw[0]), KM_NOSLEEP); - if (newbdevsw == NULL) - return ENOMEM; + if (newbdevsw == NULL) + return ENOMEM; memcpy(newbdevsw, bdevsw, max_bdevsws * sizeof(bdevsw[0])); atomic_store_release(&bdevsw, newbdevsw); atomic_store_release(&max_bdevsws, MAXDEVSW); @@ -350,8 +350,8 @@ cdevsw_attach(const struct cdevsw *devsw, devmajor_t *devmajor) KASSERT(cdevsw == cdevsw0); newcdevsw = kmem_zalloc(MAXDEVSW * sizeof(newcdevsw[0]), KM_NOSLEEP); - if (newcdevsw == NULL) - return ENOMEM; + if (newcdevsw == NULL) + return ENOMEM; memcpy(newcdevsw, cdevsw, max_cdevsws * sizeof(cdevsw[0])); atomic_store_release(&cdevsw, newcdevsw); atomic_store_release(&max_cdevsws, MAXDEVSW);