diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/softraid.c | 8 | ||||
| -rw-r--r-- | sys/dev/softraid_aoe.c | 25 | ||||
| -rw-r--r-- | sys/dev/softraid_crypto.c | 10 | ||||
| -rw-r--r-- | sys/dev/softraidvar.h | 4 |
4 files changed, 18 insertions, 29 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index f582fa31f46..c85dc829ceb 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.297 2013/03/31 11:30:59 jsing Exp $ */ +/* $OpenBSD: softraid.c,v 1.298 2013/03/31 11:37:40 jsing Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -118,7 +118,7 @@ void sr_discipline_free(struct sr_discipline *); void sr_discipline_shutdown(struct sr_discipline *, int); int sr_discipline_init(struct sr_discipline *, int); int sr_alloc_resources(struct sr_discipline *); -int sr_free_resources(struct sr_discipline *); +void sr_free_resources(struct sr_discipline *); void sr_set_chunk_state(struct sr_discipline *, int, int); void sr_set_vol_state(struct sr_discipline *); @@ -4198,13 +4198,11 @@ sr_alloc_resources(struct sr_discipline *sd) return (0); } -int +void sr_free_resources(struct sr_discipline *sd) { sr_wu_free(sd); sr_ccb_free(sd); - - return (0); } void diff --git a/sys/dev/softraid_aoe.c b/sys/dev/softraid_aoe.c index 6134edaed61..6f864ed2f59 100644 --- a/sys/dev/softraid_aoe.c +++ b/sys/dev/softraid_aoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_aoe.c,v 1.30 2013/03/02 12:50:01 jsing Exp $ */ +/* $OpenBSD: softraid_aoe.c,v 1.31 2013/03/31 11:37:40 jsing Exp $ */ /* * Copyright (c) 2008 Ted Unangst <tedu@openbsd.org> * Copyright (c) 2008 Marco Peereboom <marco@openbsd.org> @@ -60,7 +60,7 @@ int sr_aoe_create(struct sr_discipline *, struct bioc_createraid *, int sr_aoe_assemble(struct sr_discipline *, struct bioc_createraid *, int, void *); int sr_aoe_alloc_resources(struct sr_discipline *); -int sr_aoe_free_resources(struct sr_discipline *); +void sr_aoe_free_resources(struct sr_discipline *); int sr_aoe_rw(struct sr_workunit *); /* AOE target functions. */ @@ -69,7 +69,7 @@ int sr_aoe_server_create(struct sr_discipline *, struct bioc_createraid *, int sr_aoe_server_assemble(struct sr_discipline *, struct bioc_createraid *, int, void *); int sr_aoe_server_alloc_resources(struct sr_discipline *); -int sr_aoe_server_free_resources(struct sr_discipline *); +void sr_aoe_server_free_resources(struct sr_discipline *); int sr_aoe_server_start(struct sr_discipline *); void sr_aoe_request_done(struct aoe_req *, struct aoe_packet *); @@ -252,18 +252,15 @@ sr_aoe_alloc_resources(struct sr_discipline *sd) return 0; } -int +void sr_aoe_free_resources(struct sr_discipline *sd) { - int s, rv = EINVAL; struct aoe_handler *ah; + int s; DNPRINTF(SR_D_DIS, "%s: sr_aoe_free_resources\n", DEVNAME(sd->sd_sc)); - sr_wu_free(sd); - sr_ccb_free(sd); - ah = sd->mds.mdd_aoe.sra_ah; if (ah) { s = splnet(); @@ -275,8 +272,8 @@ sr_aoe_free_resources(struct sr_discipline *sd) if (sd->sd_meta) free(sd->sd_meta, M_DEVBUF); - rv = 0; - return (rv); + sr_wu_free(sd); + sr_ccb_free(sd); } int sr_send_aoe_chunk(struct sr_workunit *wu, daddr64_t blk, int i); @@ -641,7 +638,7 @@ bad: return (rv); } -int +void sr_aoe_server_free_resources(struct sr_discipline *sd) { int s; @@ -649,9 +646,6 @@ sr_aoe_server_free_resources(struct sr_discipline *sd) DNPRINTF(SR_D_DIS, "%s: sr_aoe_server_free_resources\n", DEVNAME(sd->sd_sc)); - sr_wu_free(sd); - sr_ccb_free(sd); - s = splnet(); if (sd->mds.mdd_aoe.sra_ah) { TAILQ_REMOVE(&aoe_handlers, sd->mds.mdd_aoe.sra_ah, next); @@ -659,7 +653,8 @@ sr_aoe_server_free_resources(struct sr_discipline *sd) } splx(s); - return (0); + sr_wu_free(sd); + sr_ccb_free(sd); } int diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c index c17e6881677..1cf46fc4bf0 100644 --- a/sys/dev/softraid_crypto.c +++ b/sys/dev/softraid_crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_crypto.c,v 1.89 2013/03/30 02:02:14 jsing Exp $ */ +/* $OpenBSD: softraid_crypto.c,v 1.90 2013/03/31 11:37:40 jsing Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org> @@ -87,7 +87,7 @@ int sr_crypto_create(struct sr_discipline *, int sr_crypto_assemble(struct sr_discipline *, struct bioc_createraid *, int, void *); int sr_crypto_alloc_resources(struct sr_discipline *); -int sr_crypto_free_resources(struct sr_discipline *); +void sr_crypto_free_resources(struct sr_discipline *); int sr_crypto_ioctl(struct sr_discipline *, struct bioc_discipline *); int sr_crypto_meta_opt_handler(struct sr_discipline *, @@ -1042,10 +1042,9 @@ sr_crypto_alloc_resources(struct sr_discipline *sd) return (0); } -int +void sr_crypto_free_resources(struct sr_discipline *sd) { - int rv = EINVAL; struct sr_crypto_wu *crwu; u_int i; @@ -1082,9 +1081,6 @@ sr_crypto_free_resources(struct sr_discipline *sd) sr_wu_free(sd); sr_ccb_free(sd); - - rv = 0; - return (rv); } int diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h index 344f8ac79b3..453fb58d4c5 100644 --- a/sys/dev/softraidvar.h +++ b/sys/dev/softraidvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: softraidvar.h,v 1.132 2013/03/30 14:41:36 jsing Exp $ */ +/* $OpenBSD: softraidvar.h,v 1.133 2013/03/31 11:37:40 jsing Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -584,7 +584,7 @@ struct sr_discipline { int (*sd_assemble)(struct sr_discipline *, struct bioc_createraid *, int, void *); int (*sd_alloc_resources)(struct sr_discipline *); - int (*sd_free_resources)(struct sr_discipline *); + void (*sd_free_resources)(struct sr_discipline *); int (*sd_ioctl_handler)(struct sr_discipline *, struct bioc_discipline *); int (*sd_start_discipline)(struct sr_discipline *); |