Module Name: src
Committed By: perseant
Date: Wed Jul 24 20:56:38 UTC 2024
Modified Files:
src/common/lib/libutil [perseant-exfatfs]: getfstypename.c
src/sys/sys [perseant-exfatfs]: disk.h disklabel.h
Log Message:
Add exFAT partition type.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/common/lib/libutil/getfstypename.c
cvs rdiff -u -r1.78 -r1.78.6.1 src/sys/sys/disk.h
cvs rdiff -u -r1.128 -r1.128.2.1 src/sys/sys/disklabel.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libutil/getfstypename.c
diff -u src/common/lib/libutil/getfstypename.c:1.11 src/common/lib/libutil/getfstypename.c:1.11.8.1
--- src/common/lib/libutil/getfstypename.c:1.11 Thu Jul 22 13:54:38 2021
+++ src/common/lib/libutil/getfstypename.c Wed Jul 24 20:56:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getfstypename.c,v 1.11 2021/07/22 13:54:38 skrll Exp $ */
+/* $NetBSD: getfstypename.c,v 1.11.8.1 2024/07/24 20:56:37 perseant Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -39,10 +39,10 @@
# include <sys/cdefs.h>
# ifndef _KERNEL
# if !defined(lint)
-__RCSID("$NetBSD: getfstypename.c,v 1.11 2021/07/22 13:54:38 skrll Exp $");
+__RCSID("$NetBSD: getfstypename.c,v 1.11.8.1 2024/07/24 20:56:37 perseant Exp $");
# endif
# else
-__KERNEL_RCSID(0, "$NetBSD: getfstypename.c,v 1.11 2021/07/22 13:54:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: getfstypename.c,v 1.11.8.1 2024/07/24 20:56:37 perseant Exp $");
# endif /* _KERNEL */
# define FSTYPE_ENUMNAME fstype_enum
@@ -133,6 +133,8 @@ getfstypename(int fstype)
return DKW_PTYPE_VMWRESV;
case FS_ZFS:
return DKW_PTYPE_ZFS;
+ case FS_EXFATFS:
+ return DKW_PTYPE_EXFATFS;
}
/* Stupid gcc, should know it is impossible to get here */
/*NOTREACHED*/
Index: src/sys/sys/disk.h
diff -u src/sys/sys/disk.h:1.78 src/sys/sys/disk.h:1.78.6.1
--- src/sys/sys/disk.h:1.78 Tue May 9 12:04:04 2023
+++ src/sys/sys/disk.h Wed Jul 24 20:56:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: disk.h,v 1.78 2023/05/09 12:04:04 riastradh Exp $ */
+/* $NetBSD: disk.h,v 1.78.6.1 2024/07/24 20:56:37 perseant Exp $ */
/*-
* Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
@@ -195,6 +195,7 @@ struct dkwedge_list {
#define DKW_PTYPE_HFS "hfs"
#define DKW_PTYPE_FILECORE "filecore"
#define DKW_PTYPE_EXT2FS "ext2fs"
+#define DKW_PTYPE_EXFATFS "exfatfs"
#define DKW_PTYPE_NTFS "ntfs"
#define DKW_PTYPE_RAIDFRAME "raidframe"
#define DKW_PTYPE_CCD "ccd"
Index: src/sys/sys/disklabel.h
diff -u src/sys/sys/disklabel.h:1.128 src/sys/sys/disklabel.h:1.128.2.1
--- src/sys/sys/disklabel.h:1.128 Wed Apr 10 20:00:12 2024
+++ src/sys/sys/disklabel.h Wed Jul 24 20:56:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.128 2024/04/10 20:00:12 andvar Exp $ */
+/* $NetBSD: disklabel.h,v 1.128.2.1 2024/07/24 20:56:37 perseant Exp $ */
/*
* Copyright (c) 1987, 1988, 1993
@@ -399,7 +399,8 @@ x(MINIXFS3,29, "MINIX FSv3", NULL, NUL
x(VMKCORE, 30, "VMware vmkcore", NULL, NULL) /* VMware vmkcore */ \
x(VMFS, 31, "VMware VMFS", NULL, NULL) /* VMware VMFS */ \
x(VMWRESV, 32, "VMware Reserved", NULL, NULL) /* VMware reserved */ \
-x(ZFS, 33, "ZFS", NULL, "zfs") /* ZFS */
+x(ZFS, 33, "ZFS", NULL, "zfs") /* ZFS */ \
+x(EXFATFS, 34, "exFAT", "exfatfs", "exfatfs") /* exFAT */
#ifndef _LOCORE