Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync the disklabel fstype info with the wedge partition info. 

From now on these will stay synchronized because if they don't
getfstypeinfo will not compile.
This commit is contained in:
christos 2011-11-13 22:07:00 +00:00
parent 17c5859747
commit fd091bf3da
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/sys/disk.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: disk.h,v 1.54 2009/05/20 03:26:21 dyoung Exp $ */
/* $NetBSD: disk.h,v 1.55 2011/11/13 22:07:00 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
@ -217,18 +217,33 @@ __link_set_add_data(dkwedge_methods, name ## _ddm)
#define DKW_PTYPE_UNKNOWN ""
#define DKW_PTYPE_UNUSED "unused"
#define DKW_PTYPE_SWAP "swap"
#define DKW_PTYPE_V6 "v6"
#define DKW_PTYPE_V7 "v7"
#define DKW_PTYPE_SYSV "sysv"
#define DKW_PTYPE_V71K "v71k"
#define DKW_PTYPE_V8 "v8"
#define DKW_PTYPE_FFS "ffs"
#define DKW_PTYPE_LFS "lfs"
#define DKW_PTYPE_EXT2FS "ext2fs"
#define DKW_PTYPE_ISO9660 "cd9660"
#define DKW_PTYPE_AMIGADOS "ados"
#define DKW_PTYPE_APPLEHFS "hfs"
#define DKW_PTYPE_FAT "msdos"
#define DKW_PTYPE_LFS "lfs"
#define DKW_PTYPE_OTHER "other"
#define DKW_PTYPE_HPFS "hpfs"
#define DKW_PTYPE_ISO9660 "cd9660"
#define DKW_PTYPE_BOOT "boot"
#define DKW_PTYPE_AMIGADOS "ados"
#define DKW_PTYPE_HFS "hfs"
#define DKW_PTYPE_FILECORE "filecore"
#define DKW_PTYPE_EXT2FS "ext2fs"
#define DKW_PTYPE_NTFS "ntfs"
#define DKW_PTYPE_RAIDFRAME "raidframe"
#define DKW_PTYPE_CCD "ccd"
#define DKW_PTYPE_JFS2 "jfs2"
#define DKW_PTYPE_APPLEUFS "appleufs"
#define DKW_PTYPE_NTFS "ntfs"
#define DKW_PTYPE_VINUM "vinum"
#define DKW_PTYPE_UDF "udf"
#define DKW_PTYPE_APPLEHFS "hfs"
#define DKW_PTYPE_SYSVBFS "sysvbfs"
#define DKW_PTYPE_EFS "efs"
#define DKW_PTYPE_NILFS "nilfs"
#define DKW_PTYPE_CGD "cgd"
/*

16
sys/sys/disklabel.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: disklabel.h,v 1.109 2011/06/27 11:52:24 uch Exp $ */
/* $NetBSD: disklabel.h,v 1.110 2011/11/13 22:07:00 christos Exp $ */
/*
* Copyright (c) 1987, 1988, 1993
@ -311,7 +311,10 @@ x(RUMPD, 21, "rumpd") /* rump virtual disk */ \
#ifndef _LOCORE
#define DKTYPE_NUMS(tag, number, name) __CONCAT(DTYPE_,tag=number),
enum { DKTYPE_DEFN(DKTYPE_NUMS) DKMAXTYPES };
#ifndef DKTYPE_ENUMNAME
#define DKTYPE_ENUMNAME
#endif
enum DKTYPE_ENUMNAME { DKTYPE_DEFN(DKTYPE_NUMS) DKMAXTYPES };
#undef DKTYPE_NUMS
#endif
@ -353,12 +356,16 @@ x(VINUM, 23, "vinum", NULL, NULL) /* Vinum */ \
x(UDF, 24, "UDF", NULL, "udf") /* UDF */ \
x(SYSVBFS, 25, "SysVBFS", NULL, "sysvbfs")/* System V boot file system */ \
x(EFS, 26, "EFS", NULL, "efs") /* SGI's Extent Filesystem */ \
x(NILFS, 27, "NiLFS", NULL, "nilfs") /* NTT's NiLFS(2) */
x(NILFS, 27, "NiLFS", NULL, "nilfs") /* NTT's NiLFS(2) */ \
x(CGD, 28, "cgd", NULL, NULL) /* Cryptographic disk */
#ifndef _LOCORE
#define FS_TYPENUMS(tag, number, name, fsck, mount) __CONCAT(FS_,tag=number),
enum { FSTYPE_DEFN(FS_TYPENUMS) FSMAXTYPES };
#ifndef FSTYPE_ENUMNAME
#define FSTYPE_ENUMNAME
#endif
enum FSTYPE_ENUMNAME { FSTYPE_DEFN(FS_TYPENUMS) FSMAXTYPES };
#undef FS_TYPENUMS
#endif
@ -455,6 +462,7 @@ const char *convertdisklabel(struct disklabel *, void (*)(struct buf *),
struct buf *, uint32_t);
int bounds_check_with_label(struct disk *, struct buf *, int);
int bounds_check_with_mediasize(struct buf *, int, uint64_t);
const char *getfstypeinfo(int);
#endif
#endif /* _LOCORE */