Module Name: src Committed By: pgoyette Date: Fri Aug 5 08:21:24 UTC 2016
Modified Files: src/sys/dev: vnd.c Log Message: Ignore return values when backing out of a "finish" sequence. There really shouldn't be any errors here (we're just putting something back that previously existed), and a panic() would be rather drastic. To generate a diff of this commit: cvs rdiff -u -r1.257 -r1.258 src/sys/dev/vnd.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/vnd.c diff -u src/sys/dev/vnd.c:1.257 src/sys/dev/vnd.c:1.258 --- src/sys/dev/vnd.c:1.257 Tue Jul 26 01:49:48 2016 +++ src/sys/dev/vnd.c Fri Aug 5 08:21:24 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: vnd.c,v 1.257 2016/07/26 01:49:48 pgoyette Exp $ */ +/* $NetBSD: vnd.c,v 1.258 2016/08/05 08:21:24 pgoyette Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc. @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.257 2016/07/26 01:49:48 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.258 2016/08/05 08:21:24 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_vnd.h" @@ -2106,7 +2106,7 @@ vnd_modcmd(modcmd_t cmd, void *arg) */ error = config_cfattach_detach(vnd_cd.cd_name, &vnd_ca); if (error) { - error = devsw_attach("vnd", &vnd_bdevsw, &vnd_bmajor, + (void)devsw_attach("vnd", &vnd_bdevsw, &vnd_bmajor, &vnd_cdevsw, &vnd_cmajor); aprint_error("%s: failed to detach %s cfattach, " "error %d\n", __func__, vnd_cd.cd_name, error); @@ -2114,8 +2114,8 @@ vnd_modcmd(modcmd_t cmd, void *arg) } error = config_cfdriver_detach(&vnd_cd); if (error) { - config_cfattach_attach(vnd_cd.cd_name, &vnd_ca); - devsw_attach("vnd", &vnd_bdevsw, &vnd_bmajor, + (void)config_cfattach_attach(vnd_cd.cd_name, &vnd_ca); + (void)devsw_attach("vnd", &vnd_bdevsw, &vnd_bmajor, &vnd_cdevsw, &vnd_cmajor); aprint_error("%s: failed to detach %s cfdriver, " "error %d\n", __func__, vnd_cd.cd_name, error);