svn commit: r241706 - in head/sys: conf geom/label modules/geom/geom_label

[Attilio Rao]

Author: attilio
Date: Thu Oct 18 22:18:11 2012
New Revision: 241706
URL: http://svn.freebsd.org/changeset/base/241706

Log:
  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

Modified:
  head/sys/conf/files
  head/sys/geom/label/g_label.c
  head/sys/geom/label/g_label.h
  head/sys/modules/geom/geom_label/Makefile

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Thu Oct 18 22:16:52 2012	(r241705)
+++ head/sys/conf/files	Thu Oct 18 22:18:11 2012	(r241706)
@@ -2446,6 +2446,7 @@ geom/label/g_label.c		optional geom_labe
 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

Modified: head/sys/geom/label/g_label.c
==============================================================================
--- head/sys/geom/label/g_label.c	Thu Oct 18 22:16:52 2012	(r241705)
+++ head/sys/geom/label/g_label.c	Thu Oct 18 22:18:11 2012	(r241706)
@@ -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

Modified: head/sys/geom/label/g_label.h
==============================================================================
--- head/sys/geom/label/g_label.h	Thu Oct 18 22:16:52 2012	(r241705)
+++ head/sys/geom/label/g_label.h	Thu Oct 18 22:18:11 2012	(r241706)
@@ -84,6 +84,7 @@ extern struct g_label_desc g_label_iso96
 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 */

Modified: head/sys/modules/geom/geom_label/Makefile
==============================================================================
--- head/sys/modules/geom/geom_label/Makefile	Thu Oct 18 22:16:52 2012	(r241705)
+++ head/sys/modules/geom/geom_label/Makefile	Thu Oct 18 22:18:11 2012	(r241706)
@@ -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