Module Name: src
Committed By: pgoyette
Date: Fri Aug 5 08:24:46 UTC 2016
Modified Files:
src/sys/dev: cgd.c
Log Message:
Ignore return values when restoring what has just been undone. We're
really just putting back something that was there before, so we should
not get any errors, and a panic() would be rather severe.
This and the corresponding commit to vnd.c address newly reported
Coverity CID 1364761 and CID 1364760
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/cgd.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/cgd.c
diff -u src/sys/dev/cgd.c:1.109 src/sys/dev/cgd.c:1.110
--- src/sys/dev/cgd.c:1.109 Mon Jul 25 12:45:13 2016
+++ src/sys/dev/cgd.c Fri Aug 5 08:24:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.109 2016/07/25 12:45:13 pgoyette Exp $ */
+/* $NetBSD: cgd.c,v 1.110 2016/08/05 08:24:46 pgoyette Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.109 2016/07/25 12:45:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.110 2016/08/05 08:24:46 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1082,7 +1082,7 @@ cgd_modcmd(modcmd_t cmd, void *arg)
*/
error = config_cfattach_detach(cgd_cd.cd_name, &cgd_ca);
if (error) {
- error = devsw_attach("cgd", &cgd_bdevsw, &cgd_bmajor,
+ (void)devsw_attach("cgd", &cgd_bdevsw, &cgd_bmajor,
&cgd_cdevsw, &cgd_cmajor);
aprint_error("%s: failed to detach %s cfattach, "
"error %d\n", __func__, cgd_cd.cd_name, error);
@@ -1090,8 +1090,8 @@ cgd_modcmd(modcmd_t cmd, void *arg)
}
error = config_cfdriver_detach(&cgd_cd);
if (error) {
- config_cfattach_attach(cgd_cd.cd_name, &cgd_ca);
- devsw_attach("cgd", &cgd_bdevsw, &cgd_bmajor,
+ (void)config_cfattach_attach(cgd_cd.cd_name, &cgd_ca);
+ (void)devsw_attach("cgd", &cgd_bdevsw, &cgd_bmajor,
&cgd_cdevsw, &cgd_cmajor);
aprint_error("%s: failed to detach %s cfdriver, "
"error %d\n", __func__, cgd_cd.cd_name, error);
