diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2007-11-26 13:49:27 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2007-11-26 13:49:27 +0000 |
| commit | f1c064c730e7e10c92cd788e44efecfbb0e4ca8f (patch) | |
| tree | 0d0b242dd3205684d6bd686d6a26e51c61db038a | |
| parent | 8a978ed56b75a0f4fd0602dbe656a827baeedc14 (diff) | |
rename RAID C to RAID CRYPTO. makes marco happier
| -rw-r--r-- | sys/dev/softraid.c | 12 | ||||
| -rw-r--r-- | sys/dev/softraidvar.h | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 23f99ef80cf..e97092d5954 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.85 2007/11/16 05:08:39 djm Exp $ */ +/* $OpenBSD: softraid.c,v 1.86 2007/11/26 13:49:26 tedu Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * @@ -817,10 +817,10 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user) strlcpy(sd->sd_name, "RAID 1", sizeof(sd->sd_name)); break; #if 0 - case 'c': + case 'C': if (no_chunk != 1) goto unwind; - strlcpy(sd->sd_name, "RAID C", sizeof(sd->sd_name)); + strlcpy(sd->sd_name, "RAID CRYPTO", sizeof(sd->sd_name)); break; #endif default: @@ -906,11 +906,11 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc, int user) sd->sd_set_vol_state = sr_raid_set_vol_state; break; #ifdef CRYPTO - case 'c': + case 'C': /* fill out discipline members */ - sd->sd_type = SR_MD_RAIDC; + sd->sd_type = SR_MD_RAIDCRYPTO; sd->sd_max_ccb_per_wu = no_chunk; - sd->sd_max_wu = SR_RAIDC_NOWU; + sd->sd_max_wu = SR_RAIDCRYPTO_NOWU; /* setup discipline pointers */ sd->sd_alloc_resources = sr_raidc_alloc_resources; diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h index a1f7972fc40..8b7321d80a8 100644 --- a/sys/dev/softraidvar.h +++ b/sys/dev/softraidvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: softraidvar.h,v 1.32 2007/06/06 23:06:02 deraadt Exp $ */ +/* $OpenBSD: softraidvar.h,v 1.33 2007/11/26 13:49:26 tedu Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -122,8 +122,8 @@ struct sr_raid1 { u_int32_t sr1_counter; }; -/* RAID C */ -#define SR_RAIDC_NOWU 16 +/* RAID CRYPTO */ +#define SR_RAIDCRYPTO_NOWU 16 struct sr_raidc { u_int64_t src_sid; char src_key[64]; @@ -253,7 +253,7 @@ struct sr_discipline { #define SR_MD_RAID1 1 #define SR_MD_RAID5 2 #define SR_MD_CACHE 3 -#define SR_MD_RAIDC 4 +#define SR_MD_RAIDCRYPTO 4 char sd_name[10]; /* human readable dis name */ u_int8_t sd_scsibus; /* scsibus discipline uses */ struct scsi_link sd_link; /* link to midlayer */ |