From bb7c004bd3315bb0a0cfa5c03e3a7ee5d005cbf9 Mon Sep 17 00:00:00 2001 From: apb Date: Sat, 30 Aug 2014 09:35:10 +0000 Subject: [PATCH] When converting a disklabel partition type integer to a wedge partition type string, use the strings defined in DKW_PTYPE_* in , not the strings defined in FSTYPE_DEFN in . This corrects a problem introduced in revision 1.21 dated 2014-08-18. That change was intended to add additional case to the list, but it accidentally also changed from the strings in the DKW_PTYPE_* macros to the strings in the FSTYPE_DEFN macro. Many of the strings are the same, but there are differences such as "RAID" versus "raidframe" and "MSDOS" versus "FAT". XXX: There seems to be no good reason for the differences in string names for partition types. One or both of the lists should probably be edited to align them. --- sys/dev/dkwedge/dkwedge_bsdlabel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/dkwedge/dkwedge_bsdlabel.c b/sys/dev/dkwedge/dkwedge_bsdlabel.c index 70403bd13d16..d4d261abaa16 100644 --- a/sys/dev/dkwedge/dkwedge_bsdlabel.c +++ b/sys/dev/dkwedge/dkwedge_bsdlabel.c @@ -1,4 +1,4 @@ -/* $NetBSD: dkwedge_bsdlabel.c,v 1.21 2014/08/18 14:18:59 apb Exp $ */ +/* $NetBSD: dkwedge_bsdlabel.c,v 1.22 2014/08/30 09:35:10 apb Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.21 2014/08/18 14:18:59 apb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.22 2014/08/30 09:35:10 apb Exp $"); #include #ifdef _KERNEL @@ -150,7 +150,7 @@ bsdlabel_fstype_to_str(uint8_t fstype) */ switch (fstype) { #define FSTYPE_TO_STR_CASE(tag, number, name, fsck, mount) \ - case __CONCAT(FS_,tag): str = name; break; + case __CONCAT(FS_,tag): str = __CONCAT(DKW_PTYPE_,tag); break; FSTYPE_DEFN(FSTYPE_TO_STR_CASE) #undef FSTYPE_TO_STR_CASE default: str = NULL; break;