From owner-svn-src-head@FreeBSD.ORG Thu Oct 18 22:18:11 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CA8CA9B4; Thu, 18 Oct 2012 22:18:11 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 98F698FC19; Thu, 18 Oct 2012 22:18:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9IMIBIm033578; Thu, 18 Oct 2012 22:18:11 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9IMIBjl033573; Thu, 18 Oct 2012 22:18:11 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201210182218.q9IMIBjl033573@svn.freebsd.org> From: Attilio Rao Date: Thu, 18 Oct 2012 22:18:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r241706 - in head/sys: conf geom/label modules/geom/geom_label X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Oct 2012 22:18:11 -0000 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