From 682ee99e7adad4c4181f9bf99fc0bbae7bd7bff7 Mon Sep 17 00:00:00 2001 From: Attilio Rao Date: Thu, 18 Oct 2012 22:18:11 +0000 Subject: [PATCH] It seems that it is preferable to keep support for glabel also for filesystems that we don't support natively. Revert part of r241636 to do so. This patch is not targeted for MFC. Requested by: gleb, jhb --- sys/conf/files | 1 + sys/geom/label/g_label.c | 1 + sys/geom/label/g_label.h | 1 + sys/modules/geom/geom_label/Makefile | 1 + 4 files changed, 4 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index 197956c5fc6d..2628414e4f60 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2446,6 +2446,7 @@ geom/label/g_label.c optional geom_label geom/label/g_label_ext2fs.c optional geom_label geom/label/g_label_iso9660.c optional geom_label geom/label/g_label_msdosfs.c optional geom_label +geom/label/g_label_ntfs.c optional geom_label geom/label/g_label_reiserfs.c optional geom_label geom/label/g_label_ufs.c optional geom_label geom/label/g_label_gpt.c optional geom_label diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c index 5eb908fcd6ec..0d8a3b4c4fde 100644 --- a/sys/geom/label/g_label.c +++ b/sys/geom/label/g_label.c @@ -84,6 +84,7 @@ const struct g_label_desc *g_labels[] = { &g_label_msdosfs, &g_label_ext2fs, &g_label_reiserfs, + &g_label_ntfs, &g_label_gpt, &g_label_gpt_uuid, NULL diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h index 00028fb41195..06ba2f55ef2f 100644 --- a/sys/geom/label/g_label.h +++ b/sys/geom/label/g_label.h @@ -84,6 +84,7 @@ extern struct g_label_desc g_label_iso9660; extern struct g_label_desc g_label_msdosfs; extern struct g_label_desc g_label_ext2fs; extern struct g_label_desc g_label_reiserfs; +extern struct g_label_desc g_label_ntfs; extern struct g_label_desc g_label_gpt; extern struct g_label_desc g_label_gpt_uuid; #endif /* _KERNEL */ diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile index 3c0998603497..300606ab01b5 100644 --- a/sys/modules/geom/geom_label/Makefile +++ b/sys/modules/geom/geom_label/Makefile @@ -8,6 +8,7 @@ SRCS+= g_label_ext2fs.c SRCS+= g_label_gpt.c SRCS+= g_label_iso9660.c SRCS+= g_label_msdosfs.c +SRCS+= g_label_ntfs.c SRCS+= g_label_reiserfs.c SRCS+= g_label_ufs.c