diff options
| -rw-r--r-- | sys/conf/files | 1 | ||||
| -rw-r--r-- | sys/conf/files.alpha | 1 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 1 | ||||
| -rw-r--r-- | sys/conf/files.ia64 | 1 | ||||
| -rw-r--r-- | sys/conf/files.pc98 | 1 | ||||
| -rw-r--r-- | sys/conf/files.sparc64 | 1 | ||||
| -rw-r--r-- | sys/sys/disklabel.h | 9 |
7 files changed, 15 insertions, 0 deletions
diff --git a/sys/conf/files b/sys/conf/files index f342041475534..45f0ecf9fd2a4 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -892,6 +892,7 @@ geom/bde/g_bde_work.c optional geom_bde geom/geom_aes.c optional geom_aes geom/geom_apple.c optional geom_apple geom/geom_bsd.c optional geom_bsd +geom/geom_bsd_enc.c optional geom_bsd geom/geom_ctl.c standard geom/geom_dev.c standard geom/geom_disk.c standard diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha index 4f5203c032d30..59965f1a06137 100644 --- a/sys/conf/files.alpha +++ b/sys/conf/files.alpha @@ -192,6 +192,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc geom/geom_bsd.c standard +geom/geom_bsd_enc.c standard isa/atkbd_isa.c optional atkbd isa/atkbdc_isa.c optional atkbdc isa/fd.c optional fdc diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 2468b874f3ce7..f72e03bcc995a 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -147,6 +147,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc geom/geom_bsd.c standard +geom/geom_bsd_enc.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64 index 3ec6d856c7929..7de7f33af734c 100644 --- a/sys/conf/files.ia64 +++ b/sys/conf/files.ia64 @@ -93,6 +93,7 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc geom/geom_bsd.c standard +geom/geom_bsd_enc.c standard geom/geom_gpt.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index da65e622b6480..f5b1974e579f3 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -124,6 +124,7 @@ dev/syscons/scterm-dumb.c optional sc dev/syscons/scvidctl.c optional sc dev/syscons/sysmouse.c optional sc geom/geom_bsd.c standard +geom/geom_bsd_enc.c standard geom/geom_pc98.c standard gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ warning "kernel contains GPL contaminated math emulator" diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64 index 93887df20f0f7..f499ada8ad556 100644 --- a/sys/conf/files.sparc64 +++ b/sys/conf/files.sparc64 @@ -18,6 +18,7 @@ dev/ofw/openfirmio.c standard dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa geom/geom_bsd.c standard +geom/geom_bsd_enc.c standard geom/geom_sunlabel.c standard libkern/ffs.c standard kern/syscalls.c optional ktr diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 8b4981750a8a1..baf8874d35752 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -300,6 +300,15 @@ static const char *fstypenames[] = { #define DIOCWDINFO _IOW('d', 103, struct disklabel)/* set, update disk */ #define DIOCBSDBB _IOW('d', 110, void *) /* write bootblocks */ +/* + * Functions for proper encoding/decoding of struct disklabel into/from + * bytestring. + */ +void bsd_partition_le_dec(u_char *ptr, struct partition *d); +void bsd_disklabel_le_dec(u_char *ptr, struct disklabel *d); +void bsd_partition_le_enc(u_char *ptr, struct partition *d); +void bsd_disklabel_le_enc(u_char *ptr, struct disklabel *d); + #ifndef _KERNEL __BEGIN_DECLS struct disklabel *getdiskbyname(const char *); |