[patch] RELENG_7 buildworld failure in sbin/gpt/migrate.c

[Ian FREISLICH]

Hi

Buildworld fails at this point.  ZFS info was left out of
sys/sys/disklabel.h.

===> sbin/gpt (all)
cc -O2 -fno-strict-aliasing -pipe -march=opteron -Wsystem-headers -Wall -Wno-for
mat-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpoin
ter-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-ali
gn -Wunused-parameter -Wno-uninitialized -Wno-pointer-sign -c /usr/src/sbin/gpt/
migrate.c
/usr/src/sbin/gpt/migrate.c: In function 'migrate_disklabel':
/usr/src/sbin/gpt/migrate.c:121: error: 'FS_ZFS' undeclared (first use in this f
unction)
/usr/src/sbin/gpt/migrate.c:121: error: (Each undeclared identifier is reported 
only once
/usr/src/sbin/gpt/migrate.c:121: error: for each function it appears in.)

Patch:

RCS file: /home/ncvs/src/sys/sys/disklabel.h,v
retrieving revision 1.108
diff -u -d -r1.108 disklabel.h
--- disklabel.h 12 May 2006 05:04:46 -0000      1.108
+++ disklabel.h 3 Dec 2008 09:04:01 -0000
@@ -225,6 +225,7 @@
 #define        FS_VINUM        14              /* Vinum drive */
 #define        FS_RAID         15              /* RAIDFrame drive */
 #define        FS_JFS2         21              /* IBM JFS2 */
+#define FS_ZFS          27              /* Sun's ZFS */
 
 #ifdef FSTYPENAMES
 static const char *fstypenames[] = {
@@ -249,6 +250,12 @@
        "?",
        "?",
        "jfs",
+       "?",
+       "?",
+       "?",
+       "?",
+       "?",
+       "ZFS",
        NULL
 };
 #define FSMAXTYPES     (sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)

Ian

--
Ian Freislich