diff options
Diffstat (limited to 'sys/dev/softraid_concat.c')
| -rw-r--r-- | sys/dev/softraid_concat.c | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/sys/dev/softraid_concat.c b/sys/dev/softraid_concat.c index e5f6ee270e8..1243da84d82 100644 --- a/sys/dev/softraid_concat.c +++ b/sys/dev/softraid_concat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_concat.c,v 1.12 2013/03/30 02:02:14 jsing Exp $ */ +/* $OpenBSD: softraid_concat.c,v 1.13 2013/03/31 11:12:06 jsing Exp $ */ /* * Copyright (c) 2008 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2011 Joel Sing <jsing@openbsd.org> @@ -36,8 +36,6 @@ int sr_concat_create(struct sr_discipline *, struct bioc_createraid *, int, int64_t); int sr_concat_assemble(struct sr_discipline *, struct bioc_createraid *, int, void *); -int sr_concat_alloc_resources(struct sr_discipline *); -int sr_concat_free_resources(struct sr_discipline *); int sr_concat_rw(struct sr_workunit *); /* Discipline initialisation. */ @@ -52,10 +50,8 @@ sr_concat_discipline_init(struct sr_discipline *sd) sd->sd_max_wu = SR_CONCAT_NOWU; /* Setup discipline specific function pointers. */ - sd->sd_alloc_resources = sr_concat_alloc_resources; sd->sd_assemble = sr_concat_assemble; sd->sd_create = sr_concat_create; - sd->sd_free_resources = sr_concat_free_resources; sd->sd_scsi_rw = sr_concat_rw; } @@ -89,39 +85,6 @@ sr_concat_assemble(struct sr_discipline *sd, struct bioc_createraid *bc, } int -sr_concat_alloc_resources(struct sr_discipline *sd) -{ - int rv = EINVAL; - - DNPRINTF(SR_D_DIS, "%s: sr_concat_alloc_resources\n", - DEVNAME(sd->sd_sc)); - - if (sr_wu_alloc(sd)) - goto bad; - if (sr_ccb_alloc(sd)) - goto bad; - - rv = 0; -bad: - return (rv); -} - -int -sr_concat_free_resources(struct sr_discipline *sd) -{ - int rv = EINVAL; - - DNPRINTF(SR_D_DIS, "%s: sr_concat_free_resources\n", - DEVNAME(sd->sd_sc)); - - sr_wu_free(sd); - sr_ccb_free(sd); - - rv = 0; - return (rv); -} - -int sr_concat_rw(struct sr_workunit *wu) { struct sr_discipline *sd = wu->swu_dis; |