diff options
| author |   jsing <jsing@openbsd.org> | 2013-01-15 09:28:29 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2013-01-15 09:28:29 +0000 |
| commit | 6d81b338184f7bf605d837017c5647ae89a4317d (patch) | |
| tree | 5f9598a9c2a2a387087f6febde3524ae125d58e5 /sys/dev/softraid_concat.c | |
| parent | Make the FAT setattr handling more consistent about unsupported (diff) | |
| download | wireguard-openbsd-6d81b338184f7bf605d837017c5647ae89a4317d.tar.xz wireguard-openbsd-6d81b338184f7bf605d837017c5647ae89a4317d.zip | |
Always initialise the discipline name, not just when we are doing a create.
Diffstat (limited to 'sys/dev/softraid_concat.c')
| -rw-r--r-- | sys/dev/softraid_concat.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/softraid_concat.c b/sys/dev/softraid_concat.c index 279e2073a18..76185df0451 100644 --- a/sys/dev/softraid_concat.c +++ b/sys/dev/softraid_concat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_concat.c,v 1.4 2013/01/15 04:03:01 jsing Exp $ */ +/* $OpenBSD: softraid_concat.c,v 1.5 2013/01/15 09:28:29 jsing Exp $ */ /* * Copyright (c) 2008 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2011 Joel Sing <jsing@openbsd.org> @@ -45,9 +45,9 @@ void sr_concat_intr(struct buf *); void sr_concat_discipline_init(struct sr_discipline *sd) { - /* Fill out discipline members. */ sd->sd_type = SR_MD_CONCAT; + strlcpy(sd->sd_name, "CONCAT", sizeof(sd->sd_name)); sd->sd_capabilities = SR_CAP_SYSTEM_DISK | SR_CAP_AUTO_ASSEMBLE | SR_CAP_NON_COERCED; sd->sd_max_wu = SR_CONCAT_NOWU; @@ -72,8 +72,6 @@ sr_concat_create(struct sr_discipline *sd, struct bioc_createraid *bc, return EINVAL; } - strlcpy(sd->sd_name, "CONCAT", sizeof(sd->sd_name)); - sd->sd_meta->ssdi.ssd_size = 0; for (i = 0; i < no_chunk; i++) sd->sd_meta->ssdi.ssd_size += |