diff options
Diffstat (limited to 'sys/dev/softraid.c')
| -rw-r--r-- | sys/dev/softraid.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index c392a17a161..1593c76bdcd 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.382 2017/06/12 15:43:25 jsing Exp $ */ +/* $OpenBSD: softraid.c,v 1.383 2017/07/24 12:32:32 gsoares Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -1182,7 +1182,7 @@ sr_boot_assembly(struct sr_softc *sc) /* Add this disk to the list that we've checked. */ sdk = malloc(sizeof(struct sr_disk), M_DEVBUF, - M_NOWAIT | M_CANFAIL | M_ZERO); + M_NOWAIT | M_ZERO); if (sdk == NULL) goto unwind; sdk->sdk_devno = dk->dk_devno; @@ -1231,7 +1231,7 @@ sr_boot_assembly(struct sr_softc *sc) if (bv == NULL) { bv = malloc(sizeof(struct sr_boot_volume), - M_DEVBUF, M_NOWAIT | M_CANFAIL | M_ZERO); + M_DEVBUF, M_NOWAIT | M_ZERO); if (bv == NULL) { printf("%s: failed to allocate boot volume\n", DEVNAME(sc)); @@ -1289,13 +1289,13 @@ sr_boot_assembly(struct sr_softc *sc) /* Allocate memory for device and ondisk version arrays. */ devs = mallocarray(BIOC_CRMAXLEN, sizeof(dev_t), M_DEVBUF, - M_NOWAIT | M_CANFAIL); + M_NOWAIT); if (devs == NULL) { printf("%s: failed to allocate device array\n", DEVNAME(sc)); goto unwind; } ondisk = mallocarray(BIOC_CRMAXLEN, sizeof(u_int64_t), M_DEVBUF, - M_NOWAIT | M_CANFAIL); + M_NOWAIT); if (ondisk == NULL) { printf("%s: failed to allocate ondisk array\n", DEVNAME(sc)); goto unwind; @@ -1322,7 +1322,7 @@ sr_boot_assembly(struct sr_softc *sc) /* Create hotspare chunk metadata. */ hotspare = malloc(sizeof(struct sr_chunk), M_DEVBUF, - M_NOWAIT | M_CANFAIL | M_ZERO); + M_NOWAIT | M_ZERO); if (hotspare == NULL) { printf("%s: failed to allocate hotspare\n", DEVNAME(sc)); |